From ccd8d7032ed0de6c0aa2b5cd772396e04415a043 Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Thu, 2 Apr 2026 05:23:47 +0000 Subject: [PATCH 1/4] fix: updating geolite PR to add runbook to description --- .github/workflows/update-geolite-database.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index d9ad767ce57e..558c7d03b8b4 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -75,9 +75,20 @@ jobs: git status git commit -m "chore: geoip2: update maxmind geolite country database" git push --set-upstream origin $BRANCH + cat > /tmp/pr_body.md < Date: Thu, 2 Apr 2026 05:29:38 +0000 Subject: [PATCH 2/4] fix: updating geolite PR to add runbook to description --- .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 558c7d03b8b4..da51570f8ab3 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -75,14 +75,14 @@ jobs: git status git commit -m "chore: geoip2: update maxmind geolite country database" git push --set-upstream origin $BRANCH - cat > /tmp/pr_body.md < /tmp/pr_body.md <<'EOF' + PR generated by workflow `${{ github.workflow }}` on behalf of @${{ github.actor }}. ## Runbook See: https://2u-internal.atlassian.net/wiki/spaces/AT/pages/3420061706/Runbook+GeoLite2+Country+Database+Update ## Actions Required - - [ ] Verify that only \`common/static/data/geoip/GeoLite2-Country.mmdb\` changed + - [ ] Verify that only `common/static/data/geoip/GeoLite2-Country.mmdb` changed - [ ] Wait for CI to pass - [ ] Merge this PR EOF From bf200eff696238a41467e4a81cc2720b9235777e Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Thu, 2 Apr 2026 08:55:26 +0000 Subject: [PATCH 3/4] fix: updating geolite PR to add runbook to description --- .github/workflows/update-geolite-database.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index da51570f8ab3..469a89299d38 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -66,6 +66,18 @@ jobs: git config --global user.email '${{ github.actor }}@users.noreply.github.com' git config --global user.name '${{ github.actor }}' + - name: Close obsolete GeoLite update PRs + run: | + gh pr list \ + --search '"Update GeoLite Database" in:title base:release-ulmo' \ + --state open \ + --json number \ + --jq '.[].number' | \ + xargs -r -I{} gh pr close {} \ + --comment 'Superseded by a newer automated GeoLite database update. Please review the latest PR.' + env: + GH_TOKEN: ${{ secrets.GH_PAT_WITH_ORG }} + - name: Create a branch, commit the code and make a PR id: create-pr run: | From fe69b35c42aa1cc183022d63a675f97f87bc837e Mon Sep 17 00:00:00 2001 From: ktyagiapphelix2u Date: Thu, 2 Apr 2026 09:03:17 +0000 Subject: [PATCH 4/4] fix: updating geolite PR to add runbook to description --- .github/workflows/update-geolite-database.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-geolite-database.yml b/.github/workflows/update-geolite-database.yml index 469a89299d38..4e850649e9f1 100644 --- a/.github/workflows/update-geolite-database.yml +++ b/.github/workflows/update-geolite-database.yml @@ -68,11 +68,13 @@ jobs: - name: Close obsolete GeoLite update PRs run: | + set -euo pipefail gh pr list \ - --search '"Update GeoLite Database" in:title base:release-ulmo' \ --state open \ - --json number \ - --jq '.[].number' | \ + --base 'release-ulmo' \ + --limit 100 \ + --json number,title,headRefName \ + --jq '.[] | select(.title == "Update GeoLite Database" and (.headRefName | contains("/geoip2-bot-update-country-database-"))) | .number' | \ xargs -r -I{} gh pr close {} \ --comment 'Superseded by a newer automated GeoLite database update. Please review the latest PR.' env: