update image to use pnpm instead of yarn

smartcontractkit · Oct 2, 2024 · 361a0a0 · 361a0a0
1 parent ab8e023
commit 361a0a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -33,7 +33,7 @@ jobs:
       uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: contracts/docker-build.tar
-        key: ${{ runner.os }}-docker-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}'
+        key: ${{ runner.os }}-docker-pnpm-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}
     - name: build & save image
       if: steps.cache-image.outputs.cache-hit != 'true'
       run: |
@@ -61,7 +61,7 @@ jobs:
       uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: contracts/docker-build.tar
-        key: ${{ runner.os }}-docker-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}'
+        key: ${{ runner.os }}-docker-pnpm-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}
     - name: load cached image
       run: |
         docker load --input docker-build.tar
@@ -101,7 +101,7 @@ jobs:
       uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: contracts/docker-build.tar
-        key: ${{ runner.os }}-docker-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}'
+        key: ${{ runner.os }}-docker-pnpm-build-${{ needs.get_projectserum_version.outputs.projectserum_version }}-${{ hashFiles('**/Cargo.lock') }}
     - name: load cached image
       run: |
         docker load --input docker-build.tar

diff --git a/contracts/Dockerfile b/contracts/Dockerfile
@@ -8,3 +8,7 @@ RUN cd /contracts && anchor build
 
 # only keep downloaded artifacts in /root/.cargo cached
 RUN rm -rf /contracts
+
+# remove yarn dependency, use pnpm
+RUN npm uninstall -g yarn
+RUN npm install -g pnpm