From 176feba721caec573f4e97e2d9b546a5eda73309 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 13 Oct 2024 17:22:13 +0000 Subject: [PATCH 1/3] Bump dev version after main sync --- packages/lasereyes/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lasereyes/package.json b/packages/lasereyes/package.json index a6175f1..90e95c5 100644 --- a/packages/lasereyes/package.json +++ b/packages/lasereyes/package.json @@ -1,7 +1,7 @@ { "name": "@omnisat/lasereyes", "private": false, - "version": "0.0.29", + "version": "0.0.30-rc.0", "type": "module", "main": "./dist/index.umd.cjs", "module": "./dist/index.js", From 22e0fafcc799afaa312f23e8c672af2eeec7a4c3 Mon Sep 17 00:00:00 2001 From: Andrew Hathaway Date: Sun, 13 Oct 2024 10:34:13 -0700 Subject: [PATCH 2/3] testing release --- .github/workflows/release.yml | 8 +++----- packages/lasereyes/README.md | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d830790..d9cc9df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,11 +78,11 @@ jobs: - name: Bump version for lasereyes (main) if: ${{ env.changed == 'true' && github.ref == 'refs/heads/main' }} + id: bump run: | cd packages/lasereyes new_version=$(npm version patch) echo "new_version=${new_version}" >> $GITHUB_ENV - npm version patch cd ../../ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -105,7 +105,7 @@ jobs: run: | git checkout dev git pull origin dev - git merge -X theirs origin/main # This will favor changes from main in case of conflict + git merge -X theirs origin/main cd packages/lasereyes npm version prerelease --preid=rc cd ../../ @@ -155,7 +155,7 @@ jobs: - name: Set is_rc variable id: set_is_rc run: | - if [[ "${{ steps.bump.outputs.new_version }}" == *"-rc"* ]]; then + if [[ "${{ env.new_version }}" == *"-rc"* ]]; then echo "is_rc=true" >> $GITHUB_ENV else echo "is_rc=false" >> $GITHUB_ENV @@ -170,7 +170,6 @@ jobs: echo "tag_name=v${{ env.new_version }}" >> $GITHUB_ENV fi - - name: Create GitHub Release if: ${{ env.changed == 'true' && github.ref == 'refs/heads/main' && env.is_rc == 'false' }} uses: actions/create-release@v1 @@ -183,6 +182,5 @@ jobs: draft: false prerelease: false - - name: Post Setup pnpm run: echo "Workflow completed!" diff --git a/packages/lasereyes/README.md b/packages/lasereyes/README.md index f283b16..9a1ad85 100644 --- a/packages/lasereyes/README.md +++ b/packages/lasereyes/README.md @@ -64,3 +64,4 @@ test test test test +test From 597a10a3d7d73a1db5e5d7c2d9d691369ea93a78 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 13 Oct 2024 17:35:34 +0000 Subject: [PATCH 3/3] RC version bump for lasereyes --- packages/lasereyes/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lasereyes/package.json b/packages/lasereyes/package.json index 90e95c5..dee70d5 100644 --- a/packages/lasereyes/package.json +++ b/packages/lasereyes/package.json @@ -1,7 +1,7 @@ { "name": "@omnisat/lasereyes", "private": false, - "version": "0.0.30-rc.0", + "version": "0.0.30-rc.1", "type": "module", "main": "./dist/index.umd.cjs", "module": "./dist/index.js",