From 60a225746999b7e63ea00e13b7479452680aaa3d Mon Sep 17 00:00:00 2001 From: Connor Smith Date: Sun, 24 Mar 2024 20:28:23 +1100 Subject: [PATCH] Fix variable insertion in and tagging release workflow --- .github/workflows/release.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f16f0570..02f03f6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: env: tag_prefix: 2HOL_v steps: - - name: Authentication for other repositories + - name: Setup auth for other repositories uses: actions/create-github-app-token@v1 id: app-token with: @@ -40,18 +40,16 @@ jobs: echo "new_version=$($oldVersion + 1)" >> $GITHUB_ENV echo -n "$new_version" > dataVersionNumber.txt - - name: Commit and tag version bump - OneLifeData7 #TODO does this order work? + - name: Commit and tag version - OneLifeData7 #TODO does this order work? uses: EndBug/add-and-commit@v9 with: cwd: OneLifeData7/ default_author: github_actions - message: Updatated dataVersionNumber to $new_version - tag: $tag_prefix$new_version -m "Tag automatically generated by update script." + message: Updatated dataVersionNumber to ${{ env.new_version }} + tag: ${{ env.tag_prefix }}${{ env.new_version }} -m "Tag automatically generated by GHA update script." new_branch: test-release - - name: Tag version bump - OneLife - uses: EndBug/add-and-commit@v9 - with: - cwd: OneLife/ - default_author: github_actions - tag: $tag_prefix$new_version -m "Tag automatically generated by update script." + - name: Tag version - OneLife + run: | + git -C OneLife/ tag ${{ env.tag_prefix }}${{ env.new_version }} -m "Tag automatically generated by GHA update script." + git -C OneLife/ push origin --tags