Merge branch 'develop' into bcfr-1063_fhe_empty_slice_fix

smartcontractkit · Oct 22, 2024 · 210a6f5 · 210a6f5
2 parents 9787051 + f3e66b2
commit 210a6f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -137,9 +137,9 @@ jobs:
         if: ${{ needs.filter.outputs.changes == 'true' && inputs.evm-ref != ''}}
         shell: bash
         run: go get github.com/smartcontractkit/chainlink-integrations/evm/relayer@${{ inputs.evm-ref }}
-      - name: Setup Solana
-        if: ${{ needs.filter.outputs.changes == 'true' }}
-        uses: ./.github/actions/setup-solana
+#      - name: Setup Solana
+#        if: ${{ needs.filter.outputs.changes == 'true' }}
+#        uses: ./.github/actions/setup-solana
       - name: Setup wasmd
         if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-wasmd

diff --git a/core/cmd/solana_transaction_commands_test.go b/core/cmd/solana_transaction_commands_test.go
@@ -24,6 +24,7 @@ import (
 )
 
 func TestShell_SolanaSendSol(t *testing.T) {
+	t.Skip("solana setup broken due to expired ssl")
 	ctx := testutils.Context(t)
 	chainID := "localnet"
 	url := solanaClient.SetupLocalSolNode(t)