👷 Update CI/CD

magicblock-labs · Feb 25, 2024 · d6b9474 · d6b9474
1 parent 3330c0e
commit d6b9474
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/publish-bolt-sdk.yml b/.github/workflows/publish-bolt-sdk.yml
@@ -181,7 +181,7 @@ jobs:
 
       - name: npm publish
         run: |
-          npm install --only=dev 
+          npm install --global yarn
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
           npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
           cd clients/bolt-sdk/ && yarn build && yarn lint:fix && cd ../../ && yarn lint:fix

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -155,7 +155,7 @@ jobs:
           mv "target/${{ matrix.build.TARGET }}/release/${bin}" "target/${{ matrix.build.TARGET }}/release/${release_name}"
 
       - name: Publish binary to GitHub release
-        if: env.DRY_RUN != 'true'
+        if: ${{ env.DRY_RUN != 'true' }}
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -166,8 +166,8 @@ jobs:
           asset_name: "${{ env.release_name }}"
 
       - name: Publish the NPM package
-        shell: bash
         run: |
+          echo "DRY_RUN=${DRY_RUN}"
           cd ${{ env.node_pkg }}
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
           npm set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,13 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Set if on release
-        shell: bash
-        run: |
-          if [[ $GITHUB_REF == refs/heads/release/v* ]]; then
-            echo "ON_RELEASE=true" >> $GITHUB_ENV
-          fi
       - uses: actions/cache@v4
         name: cache solana cli
         id: cache-solana
@@ -171,7 +164,7 @@ jobs:
           anchor test
 
       - name: Install the Bolt CLI and create & build a new project
-        if: ${{ env.ON_RELEASE }} == 'false'
+        if: ${{ !startsWith(github.ref, 'refs/heads/release/v') }}
         run: |
           export PATH="/home/runner/.local/share/solana/install/active_release/bin:$PATH"
           cargo install --path cli --force --locked

diff --git a/crates/bolt-lang/attribute/component-deserialize/Cargo.toml b/crates/bolt-lang/attribute/component-deserialize/Cargo.toml
@@ -13,6 +13,6 @@ proc-macro = true
 
 [dependencies]
 syn = { workspace = true }
-bolt-utils = { path = "../../utils" }
+bolt-utils = { workspace = true }
 quote = { workspace = true }
 proc-macro2 = { workspace = true }
diff --git a/crates/bolt-lang/attribute/component/Cargo.toml b/crates/bolt-lang/attribute/component/Cargo.toml
@@ -13,6 +13,6 @@ proc-macro = true
 
 [dependencies]
 syn = { workspace = true }
-bolt-utils = { path = "../../utils" }
+bolt-utils = { workspace = true }
 quote = { workspace = true }
 proc-macro2 = { workspace = true }