continue testing

smartcontractkit · Jan 9, 2025 · 9341090 · 9341090
1 parent f96c9ac
commit 9341090
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.../actions/setup-solana/build-contracts.yml → ...s/setup-solana/build-contracts/action.yml b/.../actions/setup-solana/build-contracts.yml → ...s/setup-solana/build-contracts/action.yml
@@ -1,10 +1,6 @@
 name: Solana build contracts
 description: Build Solana contracts
 
-defaults:
-  run:
-    working-directory: ./chains/solana
-
 runs:
   using: composite
   steps:
@@ -16,6 +12,7 @@ runs:
         # token: ${{ steps.token.outputs.access-token }}
     - name: Get Anchor Version
       id: get_anchor_version
+      shell: bash
       run: |
         cd chainlink-ccip
         anchor=$(make anchor_version)
@@ -36,12 +33,14 @@ runs:
         key: ${{ runner.os }}-solana-contract-artifacts-${{ hashFiles('**/Cargo.lock') }}
     - name: build & save image
       if: steps.cache-image.outputs.cache-hit != 'true'
+      shell: bash
       run: |
         cd contracts
         docker buildx build . -t ccip-solana:build --build-arg ANCHOR_CLI=${{ get_anchor_version.outputs.anchor_version }}
         docker save -o docker-build.tar ccip-solana
     - name: build & save contract compilation artifacts
       if: steps.cache-target.outputs.cache-hit != 'true'
+      shell: bash
       run: |
         docker run -v "$(pwd)/":/solana ccip-solana:build bash -c "\
           set -eoux pipefail &&\

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -227,9 +227,9 @@ jobs:
         if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
         uses: ./.github/actions/setup-solana
 
-      # - name: Build Solana artifacts
-      #   if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
-      #   uses: ./.github/actions/setup-solana/build-contracts.yml
+      - name: Build Solana artifacts
+        if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
+        uses: ./.github/actions/setup-solana/build-contracts
 
       - name: Setup wasmd
         if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}