Release 0.9.16 (#18)

chevdor · web-flow · commit a88c728674b9 · 2021-07-27T08:58:06.000+02:00
* feat: install toml-cli from binary * fix #17 * ci: slow down on CI runs * chore: upgrade subwasm * feat: report versions of the tools * chore: minor fixes * chore: bump version and upgrade subwasm * docs: add descriptions to the recipes * ci: specify the ref to be used to test PRs * test: upgrade subwasm in the test workflows * ci: ensure we don't use an old image from the cache * fix: fix bash test
diff --git a/.github/workflows/manual-acala.yml b/.github/workflows/manual-acala.yml
@@ -1,4 +1,8 @@
 name: Manual Build - Acala
+
+env:
+  SUBWASM_VERSION: 0.13.2
+
 on:
   workflow_dispatch:
     inputs:
@@ -52,10 +56,10 @@ jobs:
             ${{ matrix.chain }}-srtool-digest.json
 
       # We now get extra information thanks to subwasm,
-      - name: Install subwasm
+      - name: Install subwasm ${{ SUBWASM_VERSION }}
         run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
-          sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
+          sudo dpkg -i subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
           subwasm --version
       - name: Show Runtime information
         run: |
diff --git a/.github/workflows/manual-bridges.yml b/.github/workflows/manual-bridges.yml
@@ -1,4 +1,8 @@
 name: Manual Build - Bridges
+
+env:
+  SUBWASM_VERSION: 0.13.2
+
 on:
   workflow_dispatch:
     inputs:
@@ -53,10 +57,10 @@ jobs:
             ${{ matrix.chain }}-srtool-digest.json
 
       # We now get extra information thanks to subwasm,
-      - name: Install subwasm
+      - name: Install subwasm ${{ SUBWASM_VERSION }}
         run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
-          sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
+          sudo dpkg -i subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
           subwasm --version
       - name: Show Runtime information
         run: |
diff --git a/.github/workflows/manual-cumulus.yml b/.github/workflows/manual-cumulus.yml
@@ -1,4 +1,8 @@
 name: Manual Build - Cumulus
+
+env:
+  SUBWASM_VERSION: 0.13.2
+
 on:
   workflow_dispatch:
     inputs:
@@ -53,10 +57,10 @@ jobs:
             ${{ matrix.chain }}-srtool-digest.json
 
       # We now get extra information thanks to subwasm
-      - name: Install subwasm
+      - name: Install subwasm ${{ SUBWASM_VERSION }}
         run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
-          sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
+          sudo dpkg -i subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
           subwasm --version
       - name: Show Runtime information
         run: |
diff --git a/.github/workflows/manual-moonbeam.yml b/.github/workflows/manual-moonbeam.yml
@@ -1,4 +1,8 @@
 name: Manual Build - Moonbeam
+
+env:
+  SUBWASM_VERSION: 0.13.2
+
 on:
   workflow_dispatch:
     inputs:
@@ -51,10 +55,10 @@ jobs:
             ${{ matrix.chain }}-srtool-digest.json
 
       # We now get extra information thanks to subwasm,
-      - name: Install subwasm
+      - name: Install subwasm ${{ SUBWASM_VERSION }}
         run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
-          sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
+          sudo dpkg -i subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
           subwasm --version
       - name: Show Runtime information
         run: |
diff --git a/.github/workflows/manual-polkadot.yml b/.github/workflows/manual-polkadot.yml
@@ -1,4 +1,8 @@
 name: Manual Build - Polkadot
+
+env:
+  SUBWASM_VERSION: 0.13.2
+
 on:
   workflow_dispatch:
     inputs:
@@ -52,10 +56,10 @@ jobs:
             ${{ matrix.chain }}-srtool-digest.json
 
       # We now get extra information thanks to subwasm,
-      - name: Install subwasm
+      - name: Install subwasm ${{ SUBWASM_VERSION }}
         run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
-          sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
+          sudo dpkg -i subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
           subwasm --version
       - name: Show Runtime information
         run: |
diff --git a/.github/workflows/manual-shiden.yml b/.github/workflows/manual-shiden.yml
@@ -1,6 +1,7 @@
 name: Manual Build - Shiden
 
 env:
+  SUBWASM_VERSION: 0.13.2
   REF_FOR_SCHEDULE: production/shiden
 
 on:
@@ -56,10 +57,10 @@ jobs:
             ${{ matrix.chain }}-srtool-digest.json
 
       # We now get extra information thanks to subwasm,
-      - name: Install subwasm
+      - name: Install subwasm ${{ SUBWASM_VERSION }}
         run: |
-          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v0.12.0.deb
-          sudo dpkg -i subwasm_linux_amd64_v0.12.0.deb
+          wget https://github.com/chevdor/subwasm/releases/download/v0.12.0/subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
+          sudo dpkg -i subwasm_linux_amd64_v${{ SUBWASM_VERSION }}.deb
           subwasm --version
       - name: Show Runtime information
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
@@ -54,7 +54,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
@@ -101,7 +101,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,7 +2,11 @@ name: Build & Tests
 on:
   push:
     branches:
-      - "*"
+      - master
+    tags:
+      - "!v*"
+
+  pull_request:
 
   workflow_dispatch:
 
@@ -16,11 +20,14 @@ jobs:
     continue-on-error: false
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Build image
         run: |
           SRTOOL_VERSION=$(cat VERSION)
           RUSTC_VERSION=$(cat RUSTC_VERSION)
+          echo Building tag $RUSTC_VERSION:$SRTOOL_VERSION
           echo "SRTOOL_VERSION=$SRTOOL_VERSION" >> $GITHUB_ENV
           echo "RUSTC_VERSION=$RUSTC_VERSION" >> $GITHUB_ENV
           docker --version
@@ -34,7 +41,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
@@ -46,7 +53,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
@@ -81,7 +88,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
@@ -178,7 +185,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
@@ -275,7 +282,7 @@ jobs:
       - name: Cache the image
         uses: actions/cache@v2
         with:
-          key: srtool-docker-image
+          key: srtool-docker-image-${{ github.sha }}
           path: |
             srtool.tar.gz
 
diff --git a/Dockerfile b/Dockerfile
@@ -16,8 +16,9 @@ ENV CARGO_HOME="/cargo-home"
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Tooling
-ENV SUBWASM_VERSION=0.12.0
-ENV TERA_CLI_VERSION=0.1.3
+ARG SUBWASM_VERSION=0.13.2
+ARG TERA_CLI_VERSION=0.1.3
+ARG TOML_CLI_VERSION=0.2.1
 
 # We first init as much as we can in the first layers
 COPY ./scripts/init.sh /srtool/
@@ -34,11 +35,9 @@ RUN apt update && \
 ENV PATH="/srtool:/cargo-home/bin:$PATH"
 RUN export PATH=/cargo-home/bin:/rustup-home:$PATH && \
     /srtool/init.sh && \
-    curl -L https://github.com/chevdor/subwasm/releases/download/v${SUBWASM_VERSION}/subwasm_linux_amd64_v${SUBWASM_VERSION}.deb --output subwasm.deb && \
-    dpkg -i subwasm.deb && subwasm --version && \
-    curl -L https://github.com/chevdor/tera-cli/releases/download/v${TERA_CLI_VERSION}/tera-cli_linux_amd64.deb --output tera_cli.deb && \
-    dpkg -i tera_cli.deb && tera --version && \
-    cargo install --git https://github.com/chevdor/toml-cli --tag v0.2.0 && \
+    curl -L https://github.com/chevdor/subwasm/releases/download/v${SUBWASM_VERSION}/subwasm_linux_amd64_v${SUBWASM_VERSION}.deb --output subwasm.deb && dpkg -i subwasm.deb && subwasm --version && \
+    curl -L https://github.com/chevdor/tera-cli/releases/download/v${TERA_CLI_VERSION}/tera-cli_linux_amd64.deb --output tera_cli.deb && dpkg -i tera_cli.deb && tera --version && \
+    curl -L https://github.com/chevdor/toml-cli/releases/download/v${TOML_CLI_VERSION}/toml_linux_amd64_v${TOML_CLI_VERSION}.deb --output toml.deb && dpkg -i toml.deb && toml --version && \
     mv -f /cargo-home/bin/* /bin && \
     touch /cargo-home/env && \
     mkdir /out && \
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.15
+0.9.16
diff --git a/doc/sample-output-compressed.json b/doc/sample-output-compressed.json
@@ -99,4 +99,3 @@
 	  }
 	}
   }
-  
diff --git a/justfile b/justfile
@@ -2,17 +2,23 @@ export RUSTC_VERSION:=`cat RUSTC_VERSION`
 export REPO:="paritytech/srtool"
 export TAG:=`cat VERSION`
 
+_default:
+    just --list
+
+# Build the docker image
 build:
     #!/usr/bin/env bash
     echo Building $REPO:$RUSTC_VERSION
     echo Any arg you pass is forward to 'docker build'... You can pass'`--no-cache' for instance
     docker build $@ --build-arg RUSTC_VERSION=$RUSTC_VERSION -t $REPO:$RUSTC_VERSION-$TAG .
 
+# Build and Publish the docker image
 publish: build
     #!/usr/bin/env bash
     echo Pushing docker image $REPO:$RUSTC_VERSION
     docker push $REPO:$RUSTC_VERSION
 
+# Set a git tag
 tag:
     #!/bin/sh
     echo Tagging version $TAG
@@ -24,5 +30,6 @@ md:
     #!/usr/bin/env bash
     asciidoctor -b docbook -a leveloffset=+1 -o - README_src.adoc | pandoc   --markdown-headings=atx --wrap=preserve -t markdown_strict -f docbook - > README.md
 
+# Show version
 info:
     echo $RUSTC_VERSION
diff --git a/scripts/info b/scripts/info
@@ -10,7 +10,7 @@ PROFILE="${PROFILE:-release}"
 
 cd /build/
 
-if [ -d ".git" ]; then
+if git describe --all > /dev/null 2>&1; then
     SRC='git'
     GIT_TAG=`git describe --tags --abbrev=0`
     GIT_COMMIT_REF=`git rev-parse HEAD`
diff --git a/scripts/version b/scripts/version
@@ -2,13 +2,22 @@
 
 VERSION=`cat /srtool/VERSION`
 RUSTC_VERSION=`cat /srtool/RUSTC_VERSION`
+SUBWASM_VERSION=$(subwasm --version | awk '{ print $2}')
+TERA_VERSION=$(tera --version | awk '{ print $2}')
+TOML_VERSION=$(toml --version | awk '{ print $2}')
 
 jq -n $@ \
     --arg name srtool \
     --arg version "$VERSION" \
     --arg rustc "$RUSTC_VERSION" \
+    --arg subwasm "$SUBWASM_VERSION" \
+    --arg tera "$TERA_VERSION" \
+    --arg toml "$TOML_VERSION" \
     '{
         name: $name,
         version: $version,
-        rustc: $rustc
+        rustc: $rustc,
+        subwasm: $subwasm,
+        tera: $tera,
+        toml: $toml
     }'
