From 07e43a22080d8828875556729afa669d200b9515 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 31 May 2023 14:39:03 +0100 Subject: [PATCH 1/5] Open PR with gh CLI --- ...e-supported-enterprise-server-versions.yml | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/update-supported-enterprise-server-versions.yml b/.github/workflows/update-supported-enterprise-server-versions.yml index 5436c3067..a9407a49a 100644 --- a/.github/workflows/update-supported-enterprise-server-versions.yml +++ b/.github/workflows/update-supported-enterprise-server-versions.yml @@ -35,14 +35,22 @@ jobs: npm run build env: ENTERPRISE_RELEASES_PATH: ${{ github.workspace }}/enterprise-releases/ - - name: Commit Changes - uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666 # v5.0.1 - with: - commit-message: Update supported GitHub Enterprise Server versions. - title: Update supported GitHub Enterprise Server versions. - body: "" - author: GitHub - branch: update-supported-enterprise-server-versions - draft: true + + - name: Update git config + run: | + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + + - name: Commit changes and open PR env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + if [[ -z $(git status --porcelain) ]]; then + echo "No changes to commit" + else + git checkout -b update-supported-enterprise-server-versions + git add . + git commit --message "Update supported GitHub Enterprise Server versions" + git push + gh pr create --fill --draft + fi From afdba763260a797d16bcce8e498641fefd604731 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 31 May 2023 15:00:19 +0100 Subject: [PATCH 2/5] Wait a week before dropping support for end of life GHES versions --- .../update-supported-enterprise-server-versions/update.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-supported-enterprise-server-versions/update.py b/.github/workflows/update-supported-enterprise-server-versions/update.py index d09501ed2..56111a640 100755 --- a/.github/workflows/update-supported-enterprise-server-versions/update.py +++ b/.github/workflows/update-supported-enterprise-server-versions/update.py @@ -35,7 +35,9 @@ def main(): if oldest_supported_release is None or release_version < oldest_supported_release: end_of_life_date = datetime.date.fromisoformat(release_data["end"]) - if end_of_life_date > datetime.date.today(): + # The GHES version is not actually end of life until the end of the day specified by + # `end_of_life_date`. Wait an extra week to be safe. + if end_of_life_date > datetime.date.today() + datetime.timedelta(weeks=1): oldest_supported_release = release_version api_compatibility_data = { From e7cff66ce1871fdb3b9cdf054e5550485c0b8d12 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 31 May 2023 16:35:12 +0100 Subject: [PATCH 3/5] Fix push --- .../workflows/update-supported-enterprise-server-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-supported-enterprise-server-versions.yml b/.github/workflows/update-supported-enterprise-server-versions.yml index a9407a49a..543efa77c 100644 --- a/.github/workflows/update-supported-enterprise-server-versions.yml +++ b/.github/workflows/update-supported-enterprise-server-versions.yml @@ -51,6 +51,6 @@ jobs: git checkout -b update-supported-enterprise-server-versions git add . git commit --message "Update supported GitHub Enterprise Server versions" - git push + git push origin update-supported-enterprise-server-versions gh pr create --fill --draft fi From 955f8596aed9d71c454c46b251302b150bc1adcb Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 31 May 2023 16:49:34 +0100 Subject: [PATCH 4/5] Fix sign error --- .../update-supported-enterprise-server-versions/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-supported-enterprise-server-versions/update.py b/.github/workflows/update-supported-enterprise-server-versions/update.py index 56111a640..f2d13994d 100755 --- a/.github/workflows/update-supported-enterprise-server-versions/update.py +++ b/.github/workflows/update-supported-enterprise-server-versions/update.py @@ -37,7 +37,7 @@ def main(): end_of_life_date = datetime.date.fromisoformat(release_data["end"]) # The GHES version is not actually end of life until the end of the day specified by # `end_of_life_date`. Wait an extra week to be safe. - if end_of_life_date > datetime.date.today() + datetime.timedelta(weeks=1): + if end_of_life_date > datetime.date.today() - datetime.timedelta(weeks=1): oldest_supported_release = release_version api_compatibility_data = { From 26f16a5e63c7bebdcf17b2a6d1c7fc1861a0c611 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Wed, 31 May 2023 17:20:39 +0100 Subject: [PATCH 5/5] Rephrase the still supported calculation to make it clearer --- .../update-supported-enterprise-server-versions/update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-supported-enterprise-server-versions/update.py b/.github/workflows/update-supported-enterprise-server-versions/update.py index f2d13994d..7d9f7d308 100755 --- a/.github/workflows/update-supported-enterprise-server-versions/update.py +++ b/.github/workflows/update-supported-enterprise-server-versions/update.py @@ -37,7 +37,8 @@ def main(): end_of_life_date = datetime.date.fromisoformat(release_data["end"]) # The GHES version is not actually end of life until the end of the day specified by # `end_of_life_date`. Wait an extra week to be safe. - if end_of_life_date > datetime.date.today() - datetime.timedelta(weeks=1): + is_end_of_life = datetime.date.today() > end_of_life_date + datetime.timedelta(weeks=1) + if not is_end_of_life: oldest_supported_release = release_version api_compatibility_data = {