From dfbe93ef9d50f1bdd9d21da5a3cba28556b685e2 Mon Sep 17 00:00:00 2001 From: koenkk Date: Sun, 7 Jan 2024 14:14:14 +0100 Subject: [PATCH] chore: fix release ci --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2adb6e9b7..35453fc50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,15 +93,16 @@ jobs: - name: "release: merge dev -> master and promote dev" if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push' run: | + TAG=${GITHUB_REF#refs/*/} git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" git fetch origin git checkout master - git merge -m 'chore: merge dev to master' dev + git merge -m 'chore: merge dev to master' origin/dev git push origin master git checkout dev - jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package.json > package.json.tmp - jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package-lock.json > package-lock.json.tmp + jq ".version = \"$TAG-dev\"" package.json > package.json.tmp + jq ".version = \"$TAG-dev\"" package-lock.json > package-lock.json.tmp mv package.json.tmp package.json mv package-lock.json.tmp package-lock.json git add -A