Merge branch 'master' into master

chevdor · Aug 31, 2023 · 47bcbcb · 47bcbcb
2 parents fcc049d + 2f27b9a
commit 47bcbcb
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 25 deletions.
diff --git a/.github/workflows/cumulus.yml b/.github/workflows/cumulus.yml
@@ -5,13 +5,13 @@ env:
 
 on:
   pull_request:
-    branches:
-      - master
+    types: [opened, reopened, synchronize]
+
   push:
-    branches:
-      - "*"
     tags:
       - "v*"
+    branches:
+      - master
 
   workflow_dispatch:
     inputs:

diff --git a/.github/workflows/moonbeam.yml b/.github/workflows/moonbeam.yml
@@ -1,4 +1,3 @@
-# placeholder to be able to trigger the new workflow
 name: Manual Build - Moonbeam
 
 env:
@@ -26,8 +25,71 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - uses: actions/checkout@v3
+        with:
+          path: action
+
       - uses: actions/checkout@v3
         with:
           repository: PureStake/moonbeam
-          ref: ${{ github.event.inputs.ref }}
           fetch-depth: 0
+          path: repo
+          ref: ${{ github.event.inputs.ref }}
+
+      # We now get extra information thanks to subwasm,
+      - name: Install subwasm ${{ env.SUBWASM_VERSION }}
+        run: |
+            wget https://github.com/chevdor/subwasm/releases/download/v${{ env.SUBWASM_VERSION }}/subwasm_linux_amd64_v${{ env.SUBWASM_VERSION }}.deb
+            sudo dpkg -i subwasm_linux_amd64_v${{ env.SUBWASM_VERSION }}.deb
+            subwasm --version
+
+      - name: Srtool build
+        id: srtool_build
+        uses: ./action
+        with:
+          tag: ${{ github.event.inputs.srtool_tag }}
+          chain: ${{ matrix.chain }}
+          workdir: "${{ github.workspace }}/repo"
+
+      - name: Summary
+        run: |
+          echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.chain }}-srtool-digest.json
+          cat ${{ matrix.chain }}-srtool-digest.json
+          echo "Runtime location: ${{ steps.srtool_build.outputs.wasm }}"
+
+      # it takes a while to build the runtime, so let's save the artifact as soon as we have it
+      - name: Archive Artifacts for ${{ matrix.chain }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.chain }}-runtime
+          path: |
+            ${{ steps.srtool_build.outputs.wasm }}
+            ${{ steps.srtool_build.outputs.wasm_compressed }}
+            ${{ matrix.chain }}-srtool-digest.json
+
+      - name: Show Runtime information
+        run: |
+          subwasm info ${{ steps.srtool_build.outputs.wasm }}
+          subwasm info ${{ steps.srtool_build.outputs.wasm_compressed }}
+          subwasm --json info ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.chain }}-info.json
+          subwasm --json info ${{ steps.srtool_build.outputs.wasm_compressed }} > ${{ matrix.chain }}-info_compressed.json
+
+      - name: Extract the metadata
+        run: |
+          subwasm meta ${{ steps.srtool_build.outputs.wasm }}
+          subwasm --json meta ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.chain }}-metadata.json
+
+      - name: Check the metadata diff
+        run: |
+          # subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.chain }} | tee ${{ matrix.chain }}-diff.txt
+          echo "No live chain to compare" > ${{ matrix.chain }}-diff.txt
+
+      - name: Archive Subwasm results
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        with:
+          name: ${{ matrix.chain }}-runtime
+          path: |
+            ${{ matrix.chain }}-info.json
+            ${{ matrix.chain }}-info_compressed.json
+            ${{ matrix.chain }}-metadata.json
+            ${{ matrix.chain }}-diff.txt
diff --git a/.github/workflows/polkadot.yml b/.github/workflows/polkadot.yml
@@ -5,13 +5,13 @@ env:
 
 on:
   pull_request:
-    branches:
-      - master
+    types: [opened, reopened, synchronize]
+
   push:
-    branches:
-      - "*"
     tags:
       - "v*"
+    branches:
+      - master
 
   workflow_dispatch:
     inputs:
@@ -56,6 +56,7 @@ jobs:
           tag: ${{ github.event.inputs.srtool_tag }}
           chain: ${{ matrix.chain }}
           workdir: "${{ github.workspace }}/repo"
+          profile: "production"
 
       - name: Summary
         run: |

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ Make sure you store the yml files shown below in your repository under `.github/
           - uses: actions/checkout@v3
           - name: Srtool build
             id: srtool_build
-            uses: chevdor/srtool-actions@v0.7.0
+            uses: chevdor/srtool-actions@v0.8.0
             with:
               chain: ${{ matrix.chain }}
               runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime
@@ -103,7 +103,7 @@ Make sure you store the yml files shown below in your repository under `.github/
           - uses: actions/checkout@v3
           - name: Srtool build
             id: srtool_build
-            uses: chevdor/srtool-actions@v0.7.0
+            uses: chevdor/srtool-actions@v0.8.0
             with:
               chain: ${{ matrix.chain }}
           - name: Summary
@@ -130,7 +130,7 @@ Make sure you store the yml files shown below in your repository under `.github/
           - uses: actions/checkout@v3
           - name: Srtool build
             id: srtool_build
-            uses: chevdor/srtool-actions@v0.7.0
+            uses: chevdor/srtool-actions@v0.8.0
             with:
               chain: ${{ matrix.chain }}
               runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime
@@ -163,7 +163,7 @@ Make sure you store the yml files shown below in your repository under `.github/
           - uses: actions/checkout@v3
           - name: Srtool build
             id: srtool_build
-            uses: chevdor/srtool-actions@v0.7.0
+            uses: chevdor/srtool-actions@v0.8.0
             env:
               # optional: will be passed to docker srtool run cmd
               BUILD_OPTS: "--features on-chain-release-build"
@@ -192,7 +192,7 @@ Make sure you store the yml files shown below in your repository under `.github/
           - uses: actions/checkout@v3
           - name: Srtool build
             id: srtool_build
-            uses: chevdor/srtool-actions@v0.7.0
+            uses: chevdor/srtool-actions@v0.8.0
             env:
               # optional: will override the parachain pallet ID and authorize_upgrade call ID,
               #           which will result in a different parachain_authorize_upgrade_hash
@@ -216,7 +216,7 @@ If unset, the two envs will have the following default values:
 
 -   `PARACHAIN_PALLET_ID`: `0x01`
 
--   `AUTHORIZE_UPGRADE_PREFIX`: `0x03`
+-   `AUTHORIZE_UPGRADE_PREFIX`: `0x02`
 
 ## Contributing
 

diff --git a/action.yml b/action.yml
@@ -33,14 +33,20 @@ inputs:
   workdir:
     description: >
       Path of the project, this is where your main Cargo.toml is located. This is relative to $GITHUB_WORKSPACE.
-
-    required: true
+    default: "."
+    required: false
 
   runtime_dir:
     description: >
       Location of the runtime in your repo. The default is 'runtime/<chain_name>'
     required: false
 
+  profile:
+    description: >
+      Which profile to use with cargo build.
+    required: false
+    default: "release"
+
   rustc_version:
     description: >
       Custom rustc version send to srtool container, if not set defualt use srtool images bundled version
@@ -127,10 +133,13 @@ runs:
 
         echo "BUILD_OPTS=${{ env.BUILD_OPTS }}" >> $GITHUB_ENV
 
+        PROFILE=${{ inputs.profile }}
+        echo "PROFILE=$PROFILE" >> $GITHUB_ENV
+
         PARACHAIN_PALLET_ID=${{ env.PARACHAIN_PALLET_ID }}
         PARACHAIN_PALLET_ID=${PARACHAIN_PALLET_ID:-0x01}
         AUTHORIZE_UPGRADE_PREFIX=${{ env.AUTHORIZE_UPGRADE_PREFIX }}
-        AUTHORIZE_UPGRADE_PREFIX=${AUTHORIZE_UPGRADE_PREFIX:-0x03}
+        AUTHORIZE_UPGRADE_PREFIX=${AUTHORIZE_UPGRADE_PREFIX:-0x02}
         echo "PARACHAIN_PALLET_ID=$PARACHAIN_PALLET_ID" >> $GITHUB_ENV
         echo "AUTHORIZE_UPGRADE_PREFIX=$AUTHORIZE_UPGRADE_PREFIX" >> $GITHUB_ENV
 
@@ -150,6 +159,7 @@ runs:
         echo ℹ️ runtime_dir: ${{ env.RUNTIME_DIR }}
         echo ℹ️ build_opts: ${{ env.BUILD_OPTS }}
         echo ℹ️ parachain_pallet_id: ${{ env.PARACHAIN_PALLET_ID }}
+        echo ℹ️ profile: ${{ env.PROFILE }}
         echo ℹ️ authorize_upgrade_prefix: ${{ env.AUTHORIZE_UPGRADE_PREFIX }}
         echo ℹ️ .git folder: `ls -ald ${{ env.WORKDIR }}/.git`
         echo ℹ️ Cargo.toml: `ls -al ${{ env.WORKDIR }}/Cargo.toml`
@@ -197,6 +207,7 @@ runs:
           -e PARACHAIN_PALLET_ID 
           -e AUTHORIZE_UPGRADE_PREFIX 
           -e RUSTC_VERSION
+          -e PROFILE
           -v ${{ env.WORKDIR }}:/build 
           ${{ env.SRTOOL_IMAGE }} build --app --json -cM
         "

diff --git a/doc/parachain-overrides.adoc b/doc/parachain-overrides.adoc
@@ -6,4 +6,4 @@ Similar to https://github.com/chevdor/subwasm[subwasm], the parachain pallet ID
 If unset, the two envs will have the following default values:
 
 - `PARACHAIN_PALLET_ID`:      `0x01`
-- `AUTHORIZE_UPGRADE_PREFIX`: `0x03`
+- `AUTHORIZE_UPGRADE_PREFIX`: `0x02`
diff --git a/examples/01_basic.yml b/examples/01_basic.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         with:
           chain: ${{ matrix.chain }}
           runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime

diff --git a/examples/02_report.yml b/examples/02_report.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         with:
           chain: ${{ matrix.chain }}
       - name: Summary

diff --git a/examples/03_artifacts.yml b/examples/03_artifacts.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         with:
           chain: ${{ matrix.chain }}
           runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime

diff --git a/examples/05_build_opts.yml b/examples/05_build_opts.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         env:
           # optional: will be passed to docker srtool run cmd
           BUILD_OPTS: "--features on-chain-release-build"

diff --git a/examples/06_parachain_overrides.yml b/examples/06_parachain_overrides.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.7.0
+        uses: chevdor/srtool-actions@v0.8.0
         env:
           # optional: will override the parachain pallet ID and authorize_upgrade call ID,
           #           which will result in a different parachain_authorize_upgrade_hash