From 1dd45f39d8e592cdbb0540f9fb358c4dea273779 Mon Sep 17 00:00:00 2001 From: Scott Twiname Date: Wed, 15 May 2024 10:54:58 +1200 Subject: [PATCH] Minor CI fixes --- .github/workflows/node-docker.yml | 11 +++++------ .github/workflows/release.yml | 2 +- scripts/update_versions.sh | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/node-docker.yml b/.github/workflows/node-docker.yml index 8bfd4fa1..b54800fc 100644 --- a/.github/workflows/node-docker.yml +++ b/.github/workflows/node-docker.yml @@ -24,17 +24,16 @@ jobs: run: | if [[ "${{ github.event_name }}" == "release" ]] then - COMMIT_MESSAGE=$(git log -1 --pretty=format:"%s") - if [[ $COMMIT_MESSAGE == "[release]"* ]] && git diff --name-only HEAD~1 HEAD -- './packages/node/package.json' + TAG_NAME=${GITHUB_REF#refs/tags/} + if [[ $TAG_NAME == "node-near/"* ]] then - echo "::set-output name=changes_found::true" >> "$GITHUB_OUTPUT" + echo "changes_found=true" >> "$GITHUB_OUTPUT" else - echo "::set-output name=changes_found::false" >> "$GITHUB_OUTPUT" + echo "changes_found=false" >> "$GITHUB_OUTPUT" fi else - echo "::set-output name=changes_found::true" >> "$GITHUB_OUTPUT" + echo "changes_found=true" >> "$GITHUB_OUTPUT" fi - node-build-push-docker: needs: check if: needs.check.outputs.changes_found == 'true' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61386c0c..ec4fe6c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: run: | if [ -n "${{ github.event.head_commit.message }}" ] then - echo "commit-message=${{ github.event.head_commit.message }}" >> "$GITHUB_OUTPUT" + echo "commit-message=\"${{ github.event.head_commit.message }}\"" >> "$GITHUB_OUTPUT" else echo "commit-message=\"$(git log -1 --pretty=%B | head -n 1)\"" >> "$GITHUB_OUTPUT" fi diff --git a/scripts/update_versions.sh b/scripts/update_versions.sh index f8fba526..aa07b8f9 100755 --- a/scripts/update_versions.sh +++ b/scripts/update_versions.sh @@ -73,6 +73,8 @@ for dir in packages/*; do if [ -d "$dir" ] && [[ $(git ls-files "$dir") ]]; then prepare_package_release "$dir" fi + + git add .yarn/versions done # prepare_package_release "$1"