diff --git a/.github/workflows/bump-version-test.yml b/.github/workflows/bump-version-test.yml index 2314855..a04d33b 100644 --- a/.github/workflows/bump-version-test.yml +++ b/.github/workflows/bump-version-test.yml @@ -1,4 +1,4 @@ -name: bump-version-test +name: bump-version on: push: @@ -12,8 +12,6 @@ jobs: - uses: actions/checkout@v4 with: ssh-key: ${{ secrets.RELEASE_SSH_KEY }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-node@v4 with: cache: "yarn" @@ -28,4 +26,6 @@ jobs: git config user.email "9521010+jocmp@users.noreply.github.com" - name: Bump Version run: | - BUMPVER_NEW_VERSION=v2.2.7 make changelog + bumpver update --patch --allow-dirty + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 6cd3625..2c521b7 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -21,8 +21,6 @@ jobs: - uses: actions/checkout@v4 with: ssh-key: ${{ secrets.RELEASE_SSH_KEY }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-node@v4 with: cache: "yarn" @@ -42,4 +40,5 @@ jobs: - name: Bump Version run: | bumpver update --${{ github.event.inputs.version }} --allow-dirty - + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 0e47eff..f21ea0b 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ $(CHANGELOG_TMP): echo -e "### $(BUMPVER_NEW_VERSION) ($$(date '+%b %d, %Y'))\n" >> $(CHANGELOG_TMP) yarn run --silent changelog-maker --format=markdown >> $(CHANGELOG_TMP) cat $(CHANGELOG) | sed 1d >> $(CHANGELOG_TMP) - cat $(CHANGELOG_TMP) + cp $(CHANGELOG_TMP) $(CHANGELOG) $(CHANGELOG): $(CHANGELOG_TMP)