do the thing

smartcontractkit · Sep 27, 2024 · 007540c · 007540c
1 parent 3b016b7
commit 007540c
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 51 deletions.
diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml
@@ -22,10 +22,8 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Install asdf
-      uses: asdf-vm/actions/install@v3
-    # - name: Install Cairo
-    #   uses: ./.github/actions/install-cairo
+    - name: Install Cairo
+      uses: ./.github/actions/install-cairo
     - name: Check if image exists
       id: check-image
       uses: smartcontractkit/chainlink-github-actions/docker/image-exists@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19

diff --git a/.github/actions/install-cairo/action.yml b/.github/actions/install-cairo/action.yml
@@ -14,20 +14,29 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Setup Cairo for Linux
-      id: install-cairo
-      shell: bash
-      run: |
-        wget https://github.com/starkware-libs/cairo/releases/download/${{ inputs.cairo_version }}/release-x86_64-unknown-linux-musl.tar.gz
-        tar -xvzf release-x86_64-unknown-linux-musl.tar.gz
-        mv -vf cairo cairo-build
-        echo "$GITHUB_WORKSPACE/cairo-build/bin" >> $GITHUB_PATH
+    - name: Setup asdf
+      uses: asdf-vm/actions/setup@v3
 
-    - name: Setup Scarb for Linux
-      id: install-scarb
+    - name: Set up Scarb for Linux
       shell: bash
       run: |
-        wget https://github.com/software-mansion/scarb/releases/download/${{ inputs.scarb_version }}/scarb-${{ inputs.scarb_version }}-x86_64-unknown-linux-musl.tar.gz
-        tar -xvzf scarb-${{ inputs.scarb_version }}-x86_64-unknown-linux-musl.tar.gz
-        mv -vf scarb-${{ inputs.scarb_version }}-x86_64-unknown-linux-musl scarb-build
-        echo "$GITHUB_WORKSPACE/scarb-build/bin" >> $GITHUB_PATH
+        asdf plugin add scarb
+        asdf install scarb ${{ inputs.scarb_version }}
+
+    # - name: Setup Cairo for Linux
+    #   id: install-cairo
+    #   shell: bash
+    #   run: |
+    #     wget https://github.com/starkware-libs/cairo/releases/download/${{ inputs.cairo_version }}/release-x86_64-unknown-linux-musl.tar.gz
+    #     tar -xvzf release-x86_64-unknown-linux-musl.tar.gz
+    #     mv -vf cairo cairo-build
+    #     echo "$GITHUB_WORKSPACE/cairo-build/bin" >> $GITHUB_PATH
+
+    # - name: Setup Scarb for Linux
+    #   id: install-scarb
+    #   shell: bash
+    #   run: |
+    #     wget https://github.com/software-mansion/scarb/releases/download/${{ inputs.scarb_version }}/scarb-${{ inputs.scarb_version }}-x86_64-unknown-linux-musl.tar.gz
+    #     tar -xvzf scarb-${{ inputs.scarb_version }}-x86_64-unknown-linux-musl.tar.gz
+    #     mv -vf scarb-${{ inputs.scarb_version }}-x86_64-unknown-linux-musl scarb-build
+    #     echo "$GITHUB_WORKSPACE/scarb-build/bin" >> $GITHUB_PATH
diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml
@@ -20,11 +20,8 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
-
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
 
       - name: Test
         run: nix develop -c make test-ts-contracts
@@ -41,11 +38,8 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
-
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
 
       - name: Install Starknet Foundry
         uses: ./.github/actions/install-starknet-foundry

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -20,11 +20,8 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
-
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
 
       - name: Install Starknet Foundry
         uses: ./.github/actions/install-starknet-foundry

diff --git a/.github/workflows/integration-tests-smoke.yml b/.github/workflows/integration-tests-smoke.yml
@@ -160,10 +160,8 @@ jobs:
         uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # nix:v2.24.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
       - name: Build contracts
         run: |
           cd contracts && scarb --profile release build

diff --git a/.github/workflows/integration-tests-soak.yml b/.github/workflows/integration-tests-soak.yml
@@ -53,10 +53,8 @@ jobs:
         uses: cachix/install-nix-action@3715ab1a11cac9e991980d7b4a28d80c7ebdd8f9 # nix:v2.24.6
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
       - name: Build contracts
         run: |
           cd contracts && scarb --profile release build

diff --git a/.github/workflows/integration_gauntlet.yml b/.github/workflows/integration_gauntlet.yml
@@ -55,11 +55,8 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
 
       - name: Test
         run: nix develop -c make test-integration-gauntlet

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,11 +20,8 @@ jobs:
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      # - name: Install Cairo
-      #   uses: ./.github/actions/install-cairo
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3
+      - name: Install Cairo
+        uses: ./.github/actions/install-cairo
 
       - name: Install
         run: nix develop -c yarn install --frozen-lockfile