cleanning up branch

smartcontractkit · Jan 17, 2025 · 7531d0b · 7531d0b
1 parent 0bf27b1
commit 7531d0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/actions/setup-solana/build-contracts/action.yml b/.github/actions/setup-solana/build-contracts/action.yml
@@ -8,19 +8,20 @@ runs:
       id: get_ccip_chains_solana_revision
       shell: bash
       run: |
-        # short_revision=$(grep "github.com/smartcontractkit/chainlink-ccip/chains/solana" deployment/go.mod | awk '{print $2}' | sed 's/^v//' | awk -F- '{print $NF}')
+        # TODO get the short revision from the go.mod file
+
         short_revision=8973fd0c912b
 
-        # long_revision=$(gh api /repos/smartcontractkit/chainlink-ccip/commits/$short_revision | jq -r .sha)
+        # TODO map from the short to the long revision value, the checkout action doesn't support short revisions
         long_revision=8973fd0c912b8f5bd12283dca7e599d0241b424f
 
-        echo "CCIP_SHORT_REVISION=${short_revision}" >> $GITHUB_ENV
-        echo "CCIP_REVISION=${long_revision}" >> $GITHUB_ENV
+        echo "CHAINLINK_CCIP_COMMIT_SHORT=${short_revision}" >> $GITHUB_ENV
+        echo "CHAINLINK_CCIP_COMMIT_LONG=${long_revision}" >> $GITHUB_ENV
     - name: Checkout chainlink-ccip
       uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       with:
         repository: smartcontractkit/chainlink-ccip
-        ref: ${{ env.CCIP_REVISION }}
+        ref: ${{ env.CHAINLINK_CCIP_COMMIT_LONG }}
         fetch-depth: 0 
         path: chainlink-ccip
     - name: Get Anchor Version
@@ -68,4 +69,4 @@ runs:
       run: |
         mkdir -p /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts
         cp chainlink-ccip/chains/solana/contracts/target/deploy/*.so /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts
-        echo ${{ env.CCIP_SHORT_REVISION }} > /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts/.solana_contracts_rev
+        echo ${{ env.CHAINLINK_CCIP_COMMIT_SHORT }} > /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts/.solana_contracts_rev
diff --git a/core/scripts/setup_testdb.sh b/core/scripts/setup_testdb.sh
@@ -6,7 +6,7 @@ function exit_error {
 }
 # Create a new user and database for development
 # This script is intended to be run on a local development machine
-tdir=$(mktemp -d -t db-dev-user-XXXXXXXXXX)
+tdir=$(mktemp -d -t db-dev-user)
 
 username="chainlink_dev"
 password="insecurepassword"