From c9c4115ce7fa664fd06a79fbca0b14d8c28c286e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 4 Oct 2024 08:01:01 -0500 Subject: [PATCH 1/5] Update go driver version handling --- golang/pre-publish/action.yml | 8 ++++++-- golang/pre-publish/set-environment.sh | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 golang/pre-publish/set-environment.sh diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml index d2ec3cb..83daf73 100644 --- a/golang/pre-publish/action.yml +++ b/golang/pre-publish/action.yml @@ -11,13 +11,17 @@ inputs: runs: using: composite steps: + - name: Set up environment + shell: bash + run: + VERSION="${{ inputs.version }}" bash ${{ github.action_path }}/set-environment.sh - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.version }} version_bump_script: "go run ${{ github.action_path }}/bump-version.go" - commit_template: "BUMP v${VERSION}" + commit_template: "${{ env.COMMIT_TEMPLATE }}" push_commit: ${{ inputs.push_changes }} - uses: mongodb-labs/drivers-github-tools/tag-version@v2 with: - version: v${{ inputs.version }} + version: "${{ env.TAG_VERSION }}" push_tag: ${{ inputs.push_changes }} \ No newline at end of file diff --git a/golang/pre-publish/set-environment.sh b/golang/pre-publish/set-environment.sh new file mode 100644 index 0000000..deaca3f --- /dev/null +++ b/golang/pre-publish/set-environment.sh @@ -0,0 +1,13 @@ +#! /bin/bash +set -eu + +COMMIT_TEMPLATE='BUMP v${VERSION}' +TAG_VERSION="v${VERSION}" + +if [[ "${VERSION}" =~ cloud.* ]]; then + COMMIT_TEMPLATE='BUMP ${VERSION}' + TAG_VERSION="${VERSION}" +fi + +echo "COMMIT_TEMPLATE=$COMMIT_TEMPLATE" >> $GITHUB_OUTPUT +echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_OUTPUT \ No newline at end of file From a21e547d0d585b877b9ba4e18985c3864c2d733d Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 4 Oct 2024 08:04:58 -0500 Subject: [PATCH 2/5] fix env handling --- golang/pre-publish/set-environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/golang/pre-publish/set-environment.sh b/golang/pre-publish/set-environment.sh index deaca3f..86e3675 100644 --- a/golang/pre-publish/set-environment.sh +++ b/golang/pre-publish/set-environment.sh @@ -9,5 +9,5 @@ if [[ "${VERSION}" =~ cloud.* ]]; then TAG_VERSION="${VERSION}" fi -echo "COMMIT_TEMPLATE=$COMMIT_TEMPLATE" >> $GITHUB_OUTPUT -echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_OUTPUT \ No newline at end of file +echo "COMMIT_TEMPLATE=$COMMIT_TEMPLATE" >> $GITHUB_ENV +echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV \ No newline at end of file From 9330f87a4f544fd8b17198ba281634b0a67712d2 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 7 Oct 2024 04:54:36 -0500 Subject: [PATCH 3/5] Update golang/pre-publish/action.yml Co-authored-by: Andreas Braun --- golang/pre-publish/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml index 83daf73..654ff80 100644 --- a/golang/pre-publish/action.yml +++ b/golang/pre-publish/action.yml @@ -14,7 +14,9 @@ runs: - name: Set up environment shell: bash run: - VERSION="${{ inputs.version }}" bash ${{ github.action_path }}/set-environment.sh + bash ${{ github.action_path }}/set-environment.sh + env: + VERSION: "${{ inputs.version }}" - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.version }} From 5618604e96804de8bedc30228fa1f01aea91f818 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 7 Oct 2024 04:54:46 -0500 Subject: [PATCH 4/5] Update golang/pre-publish/set-environment.sh Co-authored-by: Andreas Braun --- golang/pre-publish/set-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golang/pre-publish/set-environment.sh b/golang/pre-publish/set-environment.sh index 86e3675..5a8d50f 100644 --- a/golang/pre-publish/set-environment.sh +++ b/golang/pre-publish/set-environment.sh @@ -4,7 +4,7 @@ set -eu COMMIT_TEMPLATE='BUMP v${VERSION}' TAG_VERSION="v${VERSION}" -if [[ "${VERSION}" =~ cloud.* ]]; then +if [[ "${VERSION}" =~ ^cloud.* ]]; then COMMIT_TEMPLATE='BUMP ${VERSION}' TAG_VERSION="${VERSION}" fi From b887f7f387678bdac012d146146af2c09815a89f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 7 Oct 2024 04:57:28 -0500 Subject: [PATCH 5/5] syntax --- golang/pre-publish/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/golang/pre-publish/action.yml b/golang/pre-publish/action.yml index 654ff80..5f747e6 100644 --- a/golang/pre-publish/action.yml +++ b/golang/pre-publish/action.yml @@ -15,8 +15,8 @@ runs: shell: bash run: bash ${{ github.action_path }}/set-environment.sh - env: - VERSION: "${{ inputs.version }}" + env: + VERSION: "${{ inputs.version }}" - uses: mongodb-labs/drivers-github-tools/bump-version@v2 with: version: ${{ inputs.version }}