From 27f6dd852f01dd29567a5f4bfe273c1baee32c45 Mon Sep 17 00:00:00 2001 From: Nicolas Dupont Date: Thu, 8 Jan 2026 11:15:44 +0100 Subject: [PATCH 1/5] Reorganize step order to ensure consistency Do not rely anymore en CasperWA/push-protected Rely now to GitHub rulesets with bypass for OTA-Release-Bot instead of classic branch protection --- .github/workflows/release.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9b15a5e8..a57a48353 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,24 +50,20 @@ jobs: git commit -m "Release v${{ steps.release-changelog.outputs.version }}" git tag v${{ steps.release-changelog.outputs.version }} - - name: Run status checks for release commit on temporary branch # Use temporary branch to enable pushing commits to this branch protected by required status checks - uses: CasperWA/push-protected@v2 - with: - token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }} - branch: main - unprotect_reviews: true - - name: Update npm run: npm install -g npm@latest + # Publish to NPM first, before pushing to repository + # If this fails, no changes are pushed to the repository, ensuring consistency - name: Publish to NPM public repository run: npm publish --provenance + # Only push to repository after successful NPM publish - name: Push changes to repository run: git push origin && git push --tags - name: Create GitHub release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: tag_name: v${{ steps.release-changelog.outputs.version }} body: ${{ steps.release-changelog.outputs.content }} From eb4fca262d86f058c3588d6aee4fe96d5d97693f Mon Sep 17 00:00:00 2001 From: Nicolas Dupont Date: Thu, 8 Jan 2026 11:15:59 +0100 Subject: [PATCH 2/5] Update dependency --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a57a48353..bf3e3dd8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }} From f2adc253644081ddf6d1dfc42fda912993efec82 Mon Sep 17 00:00:00 2001 From: Nicolas Dupont Date: Thu, 8 Jan 2026 11:16:09 +0100 Subject: [PATCH 3/5] Remove obsolete step --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf3e3dd8a..738d40c88 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,9 +50,6 @@ jobs: git commit -m "Release v${{ steps.release-changelog.outputs.version }}" git tag v${{ steps.release-changelog.outputs.version }} - - name: Update npm - run: npm install -g npm@latest - # Publish to NPM first, before pushing to repository # If this fails, no changes are pushed to the repository, ensuring consistency - name: Publish to NPM public repository From 109911d444fdda824659c2ecb30d8e70145963d8 Mon Sep 17 00:00:00 2001 From: Nicolas Dupont Date: Thu, 8 Jan 2026 11:16:13 +0100 Subject: [PATCH 4/5] lint --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 738d40c88..5edabe3aa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: pull_request_target: - branches: + branches: - main types: [ closed ] From 2b19986aa90bb9744bdfc0f289b3682b16a5b675 Mon Sep 17 00:00:00 2001 From: Nicolas Dupont Date: Thu, 8 Jan 2026 11:17:37 +0100 Subject: [PATCH 5/5] Test release workflow --- .github/workflows/commit.yml | 4 ++-- .github/workflows/release.yml | 38 +++++++++++++++++------------------ CHANGELOG.md | 8 ++++++++ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index 28b3f0902..d4e692ef2 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -25,5 +25,5 @@ jobs: - name: Install dependencies run: npm ci - - name: Lint commit messages - run: npm run commit-messages:lint + # - name: Lint commit messages + # run: npm run commit-messages:lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5edabe3aa..d6ca38bf8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: pull_request_target: branches: - - main + - test-release types: [ closed ] permissions: @@ -53,26 +53,26 @@ jobs: # Publish to NPM first, before pushing to repository # If this fails, no changes are pushed to the repository, ensuring consistency - name: Publish to NPM public repository - run: npm publish --provenance + run: npm publish --provenance --dry-run # Only push to repository after successful NPM publish - name: Push changes to repository - run: git push origin && git push --tags - - - name: Create GitHub release - uses: softprops/action-gh-release@v2 - with: - tag_name: v${{ steps.release-changelog.outputs.version }} - body: ${{ steps.release-changelog.outputs.content }} - token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }} - - - name: Trigger documentation deploy - uses: peter-evans/repository-dispatch@v2 - with: - token: ${{ secrets.TRIGGER_DOCS_DEPLOY_TOKEN }} - event-type: engine-release - repository: OpenTermsArchive/docs - client-payload: '{"version": "v${{ steps.release-changelog.outputs.version }}"}' + run: git push origin test-release + + # - name: Create GitHub release + # uses: softprops/action-gh-release@v2 + # with: + # tag_name: v${{ steps.release-changelog.outputs.version }} + # body: ${{ steps.release-changelog.outputs.content }} + # token: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }} + + # - name: Trigger documentation deploy + # uses: peter-evans/repository-dispatch@v2 + # with: + # token: ${{ secrets.TRIGGER_DOCS_DEPLOY_TOKEN }} + # event-type: engine-release + # repository: OpenTermsArchive/docs + # client-payload: '{"version": "v${{ steps.release-changelog.outputs.version }}"}' clean_changelog: if: github.event.pull_request.merged == true && needs.changelog.outputs.release-type == 'no-release' @@ -94,4 +94,4 @@ jobs: - name: Save changelog run: | git commit -m "Clean changelog" CHANGELOG.md - git push origin + git push origin test-release diff --git a/CHANGELOG.md b/CHANGELOG.md index fdd86097e..0cf95c75a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All changes that impact users of this module are documented in this file, in the [Common Changelog](https://common-changelog.org) format with some additional specifications defined in the CONTRIBUTING file. This codebase adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased [patch] + +> Development of this release was supported by the [French Ministry for Foreign Affairs](https://www.diplomatie.gouv.fr/fr/politique-etrangere-de-la-france/diplomatie-numerique/) through its ministerial [State Startups incubator](https://beta.gouv.fr/startups/open-terms-archive.html) under the aegis of the Ambassador for Digital Affairs. + +### Fixed + +- Test + ## 10.2.0 - 2026-01-08 _Full changeset and discussions: [#1219](https://github.com/OpenTermsArchive/engine/pull/1219)._