more minor fixes

centrifuge · Nov 8, 2023 · f0f25af · f0f25af
1 parent 780adbf
commit f0f25af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.github/actions/sccache-gcloud/action.yml b/.github/actions/sccache-gcloud/action.yml
@@ -23,7 +23,7 @@ runs:
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@8417cffc2ec64127ad83077aceaa8631f7cdc83e #v0.0.3
 
-    - name: set GH variables
+    - name: set GCS bucket sccache variables
       shell: bash
       run: |
         echo "SCCACHE_GCS_BUCKET=centrifuge-chain-sccache-backend" >> $GITHUB_ENV
@@ -34,7 +34,9 @@ runs:
     - name: setup Rust sccache wrapper
       if: ${{ inputs.cache == 'enabled' }}
       shell: sh
-      run: echo "RUSTC_WRAPPER="sccache"" >> $GITHUB_ENV
+      run: |
+        echo "RUSTC_WRAPPER="sccache"" >> $GITHUB_ENV
+        echo "CARGO_INCREMENTAL=false" >> $GITHUB_ENV # https://github.com/mozilla/sccache#rust
     
     - name: Run sccache stat for check
       shell: bash

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     paths:
       - ".github/workflows/build-docker.yml"
-      - "Dockerfile"
+      - "docker/centrifuge-chain/Dockerfile"
   workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}${{ github.ref == '/refs/heads/main' && github.sha || 'false' }}
@@ -53,12 +53,12 @@ jobs:
           images: centrifugeio/centrifuge-chain
           flavor: |
             suffix=-${{ env.NOW }}
-            prefix=${{ matrix.target == 'test' && 'test-' || '' }}
+            prefix=${{ matrix.target == 'test' && 'test-' || 'latest=auto' }}
           tags: |
             type=ref,event=branch
             type=ref,event=tag
             type=semver,pattern={{raw}}
-            # type=semver,pattern={{major}}
+            type=semver,pattern={{major}},prefix=${{ matrix.target == 'test' && 'test-' || '' }}pr-
             type=edge
 
       - name: Configure sccache

diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
@@ -2,6 +2,9 @@ on:
   push:
     tags:
       - '*'
+  pull_request:
+    paths:
+      - ".github/workflows/build-wasm.yml"
 name: Build&Publish WASM
 concurrency:
   group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
@@ -24,7 +27,7 @@ jobs:
         # package: [centrifuge-runtime, altair-runtime]
         target: [build-runtime, build-runtime-fast]
         package: [altair-runtime, centrifuge-runtime]
-        # rust_version: ["1.66.0"]
+        # rust_version: ["1.69.0"]
     name: ${{ matrix.target }}-${{ matrix.package }}
     # Cannot make sccache work with the srtool container
     # env:
@@ -62,9 +65,9 @@ jobs:
 
       - name: Run srtool
         run: >
-          docker run --rm  
-          -e PACKAGE=centrifuge-runtime  -e BUILD_OPTS=${{ env.BUILD_OPTS || '' }} 
-          --platform=linux/amd64  -v ${{ github.workspace }}:/build paritytech/srtool:1.66.0 
+          docker run --rm  --user root --platform=linux/amd64
+          -e PACKAGE=${{ matrix.package }} -e BUILD_OPTS=${{ env.BUILD_OPTS || '' }} 
+          -v /home/runner/.cargo:/cargo-home  -v ${{ github.workspace }}:/build paritytech/srtool:latest
           /srtool/build 
 
       # - name: Run Docker SRTool