From 1019e76b700517312fcfccfd4dfeaf8b937cb5dd Mon Sep 17 00:00:00 2001 From: DelanoWAF Date: Thu, 1 Aug 2024 14:33:06 +0200 Subject: [PATCH 1/6] Revert "ci: replace old semantic release reference" This reverts commit b577ea6acf434b0a180f8faea23cff6cad92d251. --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d1088a9..8cce3a0 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -84,10 +84,10 @@ jobs: run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer@10.0.1 conventional-changelog-conventionalcommits@6.1.0 - name: Semantic Release - run: semantic-release + run: "semantic-release" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Pull commit that holds the newly created tag - if applicable run: git pull origin main From 7cf630e20ff32b94c1db5518675fc4a881ebeab0 Mon Sep 17 00:00:00 2001 From: DelanoWAF Date: Thu, 1 Aug 2024 14:33:09 +0200 Subject: [PATCH 2/6] Revert "ci: fix incorrect token reference" This reverts commit 826de77f6c8fe68f7978b72a95b856c515adbc25. --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 8cce3a0..2bd3385 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -38,8 +38,8 @@ jobs: id: next-version run: semantic-release --dryRun env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GH_TOKEN: ${{ secrets.GH_TOKEN }} docker: uses: ./.github/workflows/docker-build-and-push-workflow.yml From 72c140acbe492ca58186f1d51100d87cde749d1a Mon Sep 17 00:00:00 2001 From: DelanoWAF Date: Thu, 1 Aug 2024 14:33:13 +0200 Subject: [PATCH 3/6] Revert "ci: apply part of ci-cd-templates' analyze-commits job" This reverts commit 9a8fae16ac255f7b5ba06331a0ef9c2424e718c3. --- .github/workflows/ci-build.yml | 57 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 2bd3385..cc25182 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -11,35 +11,36 @@ on: jobs: analyze-commits: runs-on: ubuntu-latest - outputs: - version-next: ${{ steps.next-version.outputs.release-version }} - version-next-tag: ${{ steps.next-version.outputs.release-tag }} - version-next-type: ${{ steps.next-version.outputs.release-type }} steps: - - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 - with: - disable-sudo: true - egress-policy: audit - allowed-endpoints: > - github.com:443 - - - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1 - - - name: Setup Node - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #4.0.2 - with: - node-version: 20 - - - name: Install dependencies - run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits - - - name: Get next version - id: next-version - run: semantic-release --dryRun - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - GH_TOKEN: ${{ secrets.GH_TOKEN }} + - + name: Echo DOCKER_IMAGE_REPOSITORY + run: "echo DOCKER_IMAGE_REPOSITORY: '${{ vars.DOCKER_IMAGE_REPOSITORY }}'" + - + name: Checkout + uses: actions/checkout@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - + name: "🔧 setup node" + uses: actions/setup-node@v2.1.5 + with: + node-version: 20.x + - + name: "Install plugin for semantic-release" + run: npm install @google/semantic-release-replace-plugin -D + - + name: Install dependencies + run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer@10.0.1 conventional-changelog-conventionalcommits@6.1.0 + - + name: Get next version + id: next-version + run: semantic-release --dryRun + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + outputs: + release-tag: ${{ steps.next-version.outputs.release-tag }} + release-version: ${{ steps.next-version.outputs.release-version }} docker: uses: ./.github/workflows/docker-build-and-push-workflow.yml From e09c81e502945cc4af2195a08e8be79facc4b49c Mon Sep 17 00:00:00 2001 From: DelanoWAF Date: Thu, 1 Aug 2024 14:33:16 +0200 Subject: [PATCH 4/6] Revert "ci: fix missed comma" This reverts commit 0b42618165a036e8eb928f1f293a465727a91db7. --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 3a1c20a..324bb50 100644 --- a/.releaserc +++ b/.releaserc @@ -76,7 +76,7 @@ "@semantic-release/git", { "assets": [ - "CHANGELOG.md", + "CHANGELOG.md" "classes/BuildInfo.properties", "configurations/WebformulierenVerwerker/BuildInfo.properties", "publiccode.yaml" From eb9e10ef6b9790192057b7185a8986b61dc9d223 Mon Sep 17 00:00:00 2001 From: DelanoWAF Date: Thu, 1 Aug 2024 14:33:21 +0200 Subject: [PATCH 5/6] Revert "ci: update .releaserc" This reverts commit 25a7ea597b931b48b20ed36bc251184d64d82684. --- .releaserc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.releaserc b/.releaserc index 324bb50..e50efd3 100644 --- a/.releaserc +++ b/.releaserc @@ -18,7 +18,7 @@ {"type": "test", "release": "patch"}, {"type": "build", "release": "patch"}, {"type": "ci", "release": "patch"}, - {"type": "chore", "release": patch} + {"type": "chore", "release": "patch"} ], "parserOpts": { "noteKeywords": [ @@ -62,7 +62,7 @@ ], [ "@semantic-release/exec", { - "verifyReleaseCmd": "echo \"release-tag=v${nextRelease.version}\" >> $GITHUB_OUTPUT; echo \"release-version=${nextRelease.version}\" >> $GITHUB_OUTPUT; echo \"release-type=${nextRelease.type}\" >> $GITHUB_OUTPUT" + "verifyReleaseCmd": "echo '::set-output name=release-tag::v${nextRelease.version}'; echo '::set-output name=release-version::${nextRelease.version}'" } ], [ @@ -76,7 +76,7 @@ "@semantic-release/git", { "assets": [ - "CHANGELOG.md" + "CHANGELOG.md", "classes/BuildInfo.properties", "configurations/WebformulierenVerwerker/BuildInfo.properties", "publiccode.yaml" @@ -86,4 +86,4 @@ ], "@semantic-release/github" ] -} +} \ No newline at end of file From 1ff4129b2e5cb97794432adf3c7ccc85a90bfb45 Mon Sep 17 00:00:00 2001 From: DelanoWAF Date: Thu, 1 Aug 2024 14:40:10 +0200 Subject: [PATCH 6/6] ci: add conventionalcommits override Override suggested in: https://github.com/semantic-release/release-notes-generator/issues/657 May apply necessary fixes. --- .releaserc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.releaserc b/.releaserc index e50efd3..e4ad305 100644 --- a/.releaserc +++ b/.releaserc @@ -40,6 +40,9 @@ "BREAKING" ] }, + "overrides": { + "conventional-changelog-conventionalcommits": ">= 8.0.0" + }, "writerOpts": { "commitsSort": ["subject", "scope"] },