From 60a4c51795ae049403ccfd19fa256f4589b68935 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Tue, 25 Jul 2023 11:14:36 -0400 Subject: [PATCH 01/13] ci: run patch release on thursday --- .github/workflows/auto-patch-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index 8e5b4f43..23d0143e 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -1,8 +1,8 @@ name: Automatically create patch release every 2 weeks on: schedule: - # Run every Friday right before midnight - - cron: '59 23 * * 5' + # Run every Thurdsay right before midnight + - cron: '59 23 * * 4' jobs: create_patch_release: name: Create release From 99d7258766185f3c61a18ccb810c69a0ba8f42d8 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Tue, 25 Jul 2023 11:14:54 -0400 Subject: [PATCH 02/13] TESTING: run --- .github/workflows/auto-patch-release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index 23d0143e..7ffeac16 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -1,8 +1,6 @@ name: Automatically create patch release every 2 weeks on: - schedule: - # Run every Thurdsay right before midnight - - cron: '59 23 * * 4' + pull_request jobs: create_patch_release: name: Create release From 6ddc8929b75f87bd37ff7dfb5e09420ba0ce45a9 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Wed, 26 Jul 2023 11:18:04 -0400 Subject: [PATCH 03/13] version top-level --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 18651749..7c9da5d2 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "axe-core-npm", + "version": "4.7.3", "private": true, "license": "MPL-2.0", "scripts": { From 4c120c761ee8fd0277550c7c4df4e7828506f419 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Wed, 26 Jul 2023 11:20:36 -0400 Subject: [PATCH 04/13] use this brnach for test --- .github/workflows/auto-patch-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index 7ffeac16..bd16fc11 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -15,4 +15,4 @@ jobs: odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh release-branch: master - default-branch: develop + default-branch: ci-patch-thursday From 1670309faca92a938fbb344d9c1de60200361515 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Wed, 26 Jul 2023 11:21:29 -0400 Subject: [PATCH 05/13] branch name --- .github/workflows/auto-patch-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index bd16fc11..bb91012f 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -15,4 +15,4 @@ jobs: odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh release-branch: master - default-branch: ci-patch-thursday + default-branch: ci-patch-thrusday From 54496c0c71f07da273dd549cba7f8e380f799c6c Mon Sep 17 00:00:00 2001 From: AdnoC Date: Wed, 26 Jul 2023 12:34:58 -0400 Subject: [PATCH 06/13] revert tests --- .github/workflows/auto-patch-release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index bb91012f..2eee6bf5 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -1,6 +1,8 @@ name: Automatically create patch release every 2 weeks on: - pull_request + schedule: + # Run every Thursday right before midnight + - cron: '59 23 * * 4' jobs: create_patch_release: name: Create release @@ -15,4 +17,4 @@ jobs: odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh release-branch: master - default-branch: ci-patch-thrusday + default-branch: develop From aade821ffbed5fdfcc74cf8a1f423f82207167e9 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Thu, 24 Aug 2023 13:59:09 -0400 Subject: [PATCH 07/13] also allow manual trigger --- .github/workflows/auto-patch-release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index 2eee6bf5..8e1951fe 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -3,16 +3,24 @@ on: schedule: # Run every Thursday right before midnight - cron: '59 23 * * 4' + workflow_dispatch: jobs: create_patch_release: name: Create release runs-on: ubuntu-latest steps: + - name: Determine if we skip cancel checks + id: skip-checks + shell: bash + # Skip checks if we are not a scheduled run + run: echo value=$(test ${{ github.event_name }} != schedule && echo true || echo false) >> "$GITHUB_OUTPUT" + - name: Create release uses: dequelabs/axe-api-team-public/.github/actions/auto-patch-release-v1@main with: token: ${{ secrets.GITHUB_TOKEN }} project_token: ${{ secrets.GH_PROJECT_TOKEN }} + skip_checks: ${{ steps.skip-checks.outputs.value }} slack_webhook: ${{ secrets.SLACK_WEBHOOK }} odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh From 455850a3b9aac14f03143cd18a422a15da74e08c Mon Sep 17 00:00:00 2001 From: AdnoC Date: Thu, 24 Aug 2023 14:00:01 -0400 Subject: [PATCH 08/13] TEST --- .github/workflows/auto-patch-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index 8e1951fe..c239c26f 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -4,6 +4,7 @@ on: # Run every Thursday right before midnight - cron: '59 23 * * 4' workflow_dispatch: + pull_request: jobs: create_patch_release: name: Create release @@ -25,4 +26,4 @@ jobs: odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh release-branch: master - default-branch: develop + default-branch: ci-patch-thrusday From 5e9d28c1d0532df04b65aed9658e36c0671801af Mon Sep 17 00:00:00 2001 From: AdnoC Date: Thu, 24 Aug 2023 14:13:01 -0400 Subject: [PATCH 09/13] upate prep-release script --- .github/scripts/prepare_release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/scripts/prepare_release.sh b/.github/scripts/prepare_release.sh index 1c6d9156..df18b4e9 100755 --- a/.github/scripts/prepare_release.sh +++ b/.github/scripts/prepare_release.sh @@ -6,3 +6,6 @@ set -e releaseLevel="$1" npx lerna version "$releaseLevel" --conventional-commits --no-push --no-git-tag-version --yes +version=$(node -pe 'require("./lerna.json").version') +jq '.version = $newVer' --arg newVer "$version" package.json > tmp +mv tmp package.json From b9df74f20679e96a7d91fd022942873a7992e11b Mon Sep 17 00:00:00 2001 From: AdnoC Date: Thu, 24 Aug 2023 14:17:07 -0400 Subject: [PATCH 10/13] Revert "TEST" This reverts commit 455850a3b9aac14f03143cd18a422a15da74e08c. --- .github/workflows/auto-patch-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index c239c26f..8e1951fe 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -4,7 +4,6 @@ on: # Run every Thursday right before midnight - cron: '59 23 * * 4' workflow_dispatch: - pull_request: jobs: create_patch_release: name: Create release @@ -26,4 +25,4 @@ jobs: odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh release-branch: master - default-branch: ci-patch-thrusday + default-branch: develop From 59d21ce66c3ab7db44b59630b6be927d645b1bee Mon Sep 17 00:00:00 2001 From: AdnoC Date: Tue, 5 Sep 2023 10:57:24 -0400 Subject: [PATCH 11/13] use lerna as version number source --- .github/scripts/prepare_release.sh | 3 --- .github/workflows/auto-patch-release.yml | 1 + package.json | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/scripts/prepare_release.sh b/.github/scripts/prepare_release.sh index df18b4e9..1c6d9156 100755 --- a/.github/scripts/prepare_release.sh +++ b/.github/scripts/prepare_release.sh @@ -6,6 +6,3 @@ set -e releaseLevel="$1" npx lerna version "$releaseLevel" --conventional-commits --no-push --no-git-tag-version --yes -version=$(node -pe 'require("./lerna.json").version') -jq '.version = $newVer' --arg newVer "$version" package.json > tmp -mv tmp package.json diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index 8e1951fe..d8dffb46 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -24,5 +24,6 @@ jobs: slack_webhook: ${{ secrets.SLACK_WEBHOOK }} odd_release: 'true' release-command: bash .github/scripts/prepare_release.sh + version-json: lerna.json release-branch: master default-branch: develop diff --git a/package.json b/package.json index 7c9da5d2..18651749 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "name": "axe-core-npm", - "version": "4.7.3", "private": true, "license": "MPL-2.0", "scripts": { From e887784b000c7593f86c15e7277737441e06e475 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Tue, 5 Sep 2023 10:58:05 -0400 Subject: [PATCH 12/13] TEST: run --- .github/workflows/auto-patch-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index d8dffb46..e08f6ce1 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -4,6 +4,7 @@ on: # Run every Thursday right before midnight - cron: '59 23 * * 4' workflow_dispatch: + pull_request: jobs: create_patch_release: name: Create release @@ -16,7 +17,7 @@ jobs: run: echo value=$(test ${{ github.event_name }} != schedule && echo true || echo false) >> "$GITHUB_OUTPUT" - name: Create release - uses: dequelabs/axe-api-team-public/.github/actions/auto-patch-release-v1@main + uses: dequelabs/axe-api-team-public/.github/actions/auto-patch-release-v1@other-version-source with: token: ${{ secrets.GITHUB_TOKEN }} project_token: ${{ secrets.GH_PROJECT_TOKEN }} From 59b289bfeffa6e5402b5263fc7e7ff117766fc19 Mon Sep 17 00:00:00 2001 From: AdnoC Date: Tue, 5 Sep 2023 11:06:19 -0400 Subject: [PATCH 13/13] Revert "TEST: run" This reverts commit e887784b000c7593f86c15e7277737441e06e475. --- .github/workflows/auto-patch-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/auto-patch-release.yml b/.github/workflows/auto-patch-release.yml index e08f6ce1..d8dffb46 100644 --- a/.github/workflows/auto-patch-release.yml +++ b/.github/workflows/auto-patch-release.yml @@ -4,7 +4,6 @@ on: # Run every Thursday right before midnight - cron: '59 23 * * 4' workflow_dispatch: - pull_request: jobs: create_patch_release: name: Create release @@ -17,7 +16,7 @@ jobs: run: echo value=$(test ${{ github.event_name }} != schedule && echo true || echo false) >> "$GITHUB_OUTPUT" - name: Create release - uses: dequelabs/axe-api-team-public/.github/actions/auto-patch-release-v1@other-version-source + uses: dequelabs/axe-api-team-public/.github/actions/auto-patch-release-v1@main with: token: ${{ secrets.GITHUB_TOKEN }} project_token: ${{ secrets.GH_PROJECT_TOKEN }}