small fixes

centrifuge · Sep 15, 2023 · 59a737a · 59a737a
1 parent 12292b0
commit 59a737a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -12,14 +12,16 @@ env:
   RUST_TOOLCHAIN: "1.66"
 jobs:
   docker:
+    concurrency:
+      group: 'build-docker-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+      cancel-in-progress: true    
     strategy:
       matrix:
         target: [ release, test ]
     runs-on: ubuntu-latest-4-cores
     env:
       WORKFLOW_TAG: ${{ github.event.inputs.docker_tag }}
     steps:
-
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
@@ -43,7 +45,7 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}        
 
-      - run: echo "NOW=$(date -u +%Y%m%d)" >> $GITHUB_ENV
+      - run: echo "NOW=$(date -u +%y-%m-%d)" >> $GITHUB_ENV
 
       - name: Setup docker metadata
         id: meta

diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
@@ -61,6 +61,7 @@ jobs:
           elif ${{ matrix.target == 'build-runtime-fast'}} ; then
             echo "BUILD_OPTS="--features=fast-runtime"" >> GITHUB_ENV
           fi
+          echo "BUILD_OPTS=${{ env.BUILD_OPT }}"
 
       - name: Run Docker SRTool
         uses: addnab/docker-run-action@v3
@@ -71,15 +72,12 @@ jobs:
           image: paritytech/srtool:${{ matrix.rust_version }}
           options: --user root -v /home/runner/.cargo:/cargo-home -v ${{ github.workspace }}:/build -e PACKAGE=${{ matrix.package }}
           run: |
+            echo "---- Env VARS ----"
             echo "BUILD_OPT=${BUILD_OPT}"
             echo "PACKAGE=${PACKAGE}"
             echo "---- List Cache Folder ----"
             ls -la /cargo-home/
             du -sh /cargo-home/*
-            echo "---- Rust Versions ----"
-            rustc --version
-            rustup --version
-            cargo --version
             echo "---- RUNNING BUILD ----"
             /srtool/build --json
 
@@ -100,7 +98,7 @@ jobs:
         run: |
           target=$(echo "${{ matrix.target }}" | sed -e "s/^build-//" )
           runtime_name=$(echo "${{ matrix.package }}" | sed -e "s/-runtime$//" )
-          filename=$(echo "${{ matrix.package }}" | sed -i 's/-/_/g' )
+          filename=$(echo "${{ matrix.package }}" | sed -e 's/-/_/g' )
           gsutil cp \
             ./runtime/${runtime_name}/target/srtool/release/wbuild/${{ matrix.package }}/${filename}.compact.compressed.wasm \
             gs://centrifuge-wasm-repo/$RUNTIME/${target}/${runtime_name}-${target}-$(git rev-parse --short HEAD).wasm