From c901a8eac57acc0147fc4b3edb59bc658e97a17c Mon Sep 17 00:00:00 2001 From: gparmigiani Date: Mon, 12 May 2025 16:23:35 +0200 Subject: [PATCH 1/2] chore: fix versionize multiple entries --- .github/workflows/publish.yml | 13 +++++++++++++ CHANGELOG.md | 7 ++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index af648a8..0d700ff 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,6 +36,19 @@ jobs: run: dotnet versionize continue-on-error: true + - name: Push version changes + if: steps.versionize.outcome == 'success' + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: main + tags: true + + # Checkout the repository again to ensure the latest changes are available + - name: Checkout repository after versionize + if: steps.versionize.outcome == 'success' + uses: actions/checkout@v4 + - name: No release required if: steps.versionize.outcome != 'success' run: echo "Skipping publishing. No release required." diff --git a/CHANGELOG.md b/CHANGELOG.md index a06836d..69b4a63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,12 @@ All notable changes to this project will be documented in this file. See [versionize](https://github.com/versionize/versionize) for commit guidelines. - -## [1.4.0](https://www.github.com/jkone27/fsharp-integration-tests/releases/tag/v1.4.0) (2025-05-12) - ### Features * renamed TestClient to TestWebAppFactoryBuilder, fix to publish and docs ([a3a90a1](https://www.github.com/jkone27/fsharp-integration-tests/commit/a3a90a1bc91b880225d9db07f67aa794859bf7be)) - -## [1.3.0](https://www.github.com/jkone27/fsharp-integration-tests/releases/tag/v1.3.0) (2025-05-10) + +## [1.4.0](https://www.github.com/jkone27/fsharp-integration-tests/releases/tag/v1.4.0) (2025-05-12) ## [1.3.0](https://www.github.com/jkone27/fsharp-integration-tests/releases/tag/v1.3.0) (2025-05-10) From 6f89a95c36492227b7c6056528c14726774c350a Mon Sep 17 00:00:00 2001 From: gparmigiani Date: Mon, 12 May 2025 16:26:41 +0200 Subject: [PATCH 2/2] chore: remove duplicate push --- .github/workflows/publish.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d700ff..e754602 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -64,11 +64,3 @@ jobs: - name: Push Package if: steps.versionize.outcome == 'success' run: dotnet nuget push ./nupkgs/*.nupkg --api-key ${{secrets.NUGET_KEY}} --skip-duplicate - - - name: Push changes to GitHub - if: steps.versionize.outcome == 'success' - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: main - tags: true