From c73c01b6e637665ee4b898ddf441b6c788db93e7 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Wed, 19 Nov 2025 06:42:14 +0000 Subject: [PATCH 1/6] fix: update geolite workflow --- .github/workflows/update-geolite-database.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index 484fa167a371..d7303840a9fb 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -8,7 +8,7 @@ on: branch: description: "Target branch against which to create PR" required: false - default: "master" + default: "release-ulmo" env: MAXMIND_URL: "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key=${{ secrets.MAXMIND_LICENSE_KEY }}&suffix=tar.gz" @@ -79,8 +79,8 @@ jobs: --title "Update GeoLite Database" \ --body "PR generated by workflow `${{ github.workflow }}` on behalf of @${{ github.actor }}." \ --head $BRANCH \ - --base 'master' \ - --reviewer 'feanil' \ + --base 'release-ulmo' \ + --reviewer 'edx/orbi-bom' \ | grep -o 'https://github.com/.*/pull/[0-9]*') echo "PR Created: ${PR_URL}" echo "pull-request-url=$PR_URL" >> $GITHUB_OUTPUT From 0842fac14196fad5af9a57f28f785a87f048c7c2 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Fri, 21 Nov 2025 08:46:06 +0000 Subject: [PATCH 2/6] fix: update geolite workflow --- .github/workflows/update-geolite-database.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index d7303840a9fb..6debc351b350 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -70,22 +70,22 @@ jobs: id: create-pr run: | BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-$(echo "${{ github.sha }}" | cut -c 1-7)" - git checkout -b $BRANCH + git checkout -b "$BRANCH" git add . git status git commit -m "chore: geoip2: update maxmind geolite country database" - git push --set-upstream origin $BRANCH + git push --set-upstream origin "$BRANCH" PR_URL=$(gh pr create \ --title "Update GeoLite Database" \ --body "PR generated by workflow `${{ github.workflow }}` on behalf of @${{ github.actor }}." \ - --head $BRANCH \ + --head "$BRANCH" \ --base 'release-ulmo' \ --reviewer 'edx/orbi-bom' \ | grep -o 'https://github.com/.*/pull/[0-9]*') echo "PR Created: ${PR_URL}" echo "pull-request-url=$PR_URL" >> $GITHUB_OUTPUT env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.GH_PAT_WITH_ORG }} - name: Job summary run: | From a2926835fa8f6b6f77ce4ca980290a67d3f55fa6 Mon Sep 17 00:00:00 2001 From: Krish Tyagi Date: Fri, 21 Nov 2025 16:09:37 +0530 Subject: [PATCH 3/6] fix: Update branch naming convention for PR creation --- .github/workflows/update-geolite-database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index 6debc351b350..5f375f26e74c 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -69,7 +69,7 @@ jobs: - name: Create a branch, commit the code and make a PR id: create-pr run: | - BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-$(echo "${{ github.sha }}" | cut -c 1-7)" + BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-${{ github.run_id }}" git checkout -b "$BRANCH" git add . git status From d6c741fe22ef74e3eb8e6b47f0429a234e014671 Mon Sep 17 00:00:00 2001 From: Krish Tyagi Date: Fri, 21 Nov 2025 17:10:07 +0530 Subject: [PATCH 4/6] fix: variable usage in update-geolite-database --- .github/workflows/update-geolite-database.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index 5f375f26e74c..9b00ad821a78 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -74,11 +74,11 @@ jobs: git add . git status git commit -m "chore: geoip2: update maxmind geolite country database" - git push --set-upstream origin "$BRANCH" + git push --set-upstream origin $BRANCH PR_URL=$(gh pr create \ --title "Update GeoLite Database" \ --body "PR generated by workflow `${{ github.workflow }}` on behalf of @${{ github.actor }}." \ - --head "$BRANCH" \ + --head $BRANCH \ --base 'release-ulmo' \ --reviewer 'edx/orbi-bom' \ | grep -o 'https://github.com/.*/pull/[0-9]*') From 3501dfadf584c46e500e3565df629235ff01b9e9 Mon Sep 17 00:00:00 2001 From: Krish Tyagi Date: Fri, 21 Nov 2025 17:11:26 +0530 Subject: [PATCH 5/6] fix: branch creation command in workflow --- .github/workflows/update-geolite-database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index 9b00ad821a78..d9ad767ce57e 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -70,7 +70,7 @@ jobs: id: create-pr run: | BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-${{ github.run_id }}" - git checkout -b "$BRANCH" + git checkout -b $BRANCH git add . git status git commit -m "chore: geoip2: update maxmind geolite country database" From 248d96cbf14ad524dd120851f1d24d95f29e7384 Mon Sep 17 00:00:00 2001 From: Krish Tyagi Date: Tue, 9 Dec 2025 00:06:47 +0530 Subject: [PATCH 6/6] fix: branch naming convention for GeoIP updates --- .github/workflows/update-geolite-database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index d9ad767ce57e..c13cd5469722 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -69,7 +69,7 @@ jobs: - name: Create a branch, commit the code and make a PR id: create-pr run: | - BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-${{ github.run_id }}" + BRANCH="${{ github.actor }}/geoip2-bot-update-country-database-$(echo "${{ github.sha }}" | cut -c 1-7)" git checkout -b $BRANCH git add . git status