Merge pull request #4733 from Joystream/ephesus

Ephesus Release

.github/workflows/deploy-playground.yml

@@ -30,14 +30,10 @@ on:
         description: 'Scenario name to run after chain stats'
         required: false
         default: 'setupNewChainMultiStorage'
-      sudoSuri:
-        description: 'SURI of sudo account - must be different than treasury'
-        required: false
-        default: '//Alice'
       treasurySuri:
-        description: 'SURI of treasury account - must be different than sudo'
+        description: 'SURI of treasury account'
         required: false
-        default: '//Bob'
+        default: '//Alice'
       initialBalances: 
         description: 'JSON string or http URL to override initial balances and vesting config'
         default: ''
@@ -106,7 +102,6 @@ jobs:
                           stack_name=${{ env.STACK_NAME }} \
                           runtime_profile=${{ github.event.inputs.runtimeProfile }} \
                           ssh_pub_key='${{ github.event.inputs.sshPubKey }}' \
-                          sudo_suri='${{ github.event.inputs.sudoSuri }}' \
                           treasury_suri='${{ github.event.inputs.treasurySuri }}' \
                           initial_balances='${{ github.event.inputs.initialBalances }}' \
                           init_chain_scenario='${{ github.event.inputs.chainSetupScenario }}'"

.github/workflows/joystream-cli.yml

@@ -19,6 +19,7 @@ jobs:
           yarn install --frozen-lockfile
           yarn workspace @joystream/types build
           yarn workspace @joystream/metadata-protobuf build
+          yarn workspace @joystream/js build
           yarn workspace query-node-root build
       - name: yarn pack test
         run: |
@@ -43,6 +44,7 @@ jobs:
           yarn install --frozen-lockfile --network-timeout 120000
           yarn workspace @joystream/types build
           yarn workspace @joystream/metadata-protobuf build
+          yarn workspace @joystream/js build
           yarn workspace query-node-root build
       - name: yarn pack test
         run: |

.github/workflows/query-node.yml

@@ -19,6 +19,7 @@ jobs:
         yarn install --frozen-lockfile
         yarn workspace @joystream/types build
         yarn workspace @joystream/metadata-protobuf build
+        yarn workspace @joystream/js build
         yarn workspace query-node-root build
 
   query_node_build_osx:
@@ -38,4 +39,5 @@ jobs:
         yarn install --frozen-lockfile --network-timeout 120000
         yarn workspace @joystream/types build
         yarn workspace @joystream/metadata-protobuf build
+        yarn workspace @joystream/js build
         yarn workspace query-node-root build

.github/workflows/run-network-tests.yml

@@ -54,7 +54,7 @@ jobs:
       - id: compute_shasum
         name: Compute runtime code shasum
         env:
-          RUNTIME_PROFILE: "TESTING"
+          RUNTIME_PROFILE: 'TESTING'
         run: |
           export RUNTIME_CODE_SHASUM=`scripts/runtime-code-shasum.sh`
           echo "::set-output name=shasum::${RUNTIME_CODE_SHASUM}"
@@ -93,18 +93,18 @@ jobs:
         id: check_files
         uses: andstor/file-existence-action@v1
         with:
-          files: "joystream-node-docker-image.tar.gz"
+          files: 'joystream-node-docker-image.tar.gz'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # v1.7
         id: builder1
         if: steps.check_files.outputs.files_exists == 'false'
-  
+
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
-         path: /tmp/.buildx-cache
-         key: ${{ runner.os }}-buildx
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx
         if: steps.check_files.outputs.files_exists == 'false'
 
       - name: Build
@@ -143,8 +143,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        scenario: ['full', 'setupNewChain', 'setupNewChainMultiStorage', 'bonding', 'carthageNPoSSwitch', 'storageSync']
+        scenario: ['full', 'setupNewChain', 'setupNewChainMultiStorage', 'bonding', 'storageSync']
         include:
+          - scenario: 'full'
+            no_storage: 'false'
           - scenario: 'setupNewChain'
             no_storage: 'true'
           - scenario: 'setupNewChainMultiStorage'
@@ -173,36 +175,123 @@ jobs:
           export NO_STORAGE=${{ matrix.no_storage }}
           tests/network-tests/run-tests.sh ${{ matrix.scenario }}
 
+  build_master_testing:
+    name: Build joystream node images for mainnet-testing
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/master'
+    outputs:
+      use_artifact: ${{ steps.compute_shasum.outputs.shasum }}-joystream-node-docker-image.tar.gz
+    steps:
+      - name: check out master repo
+        uses: actions/checkout@v3
+        with:
+          repository: Joystream/joystream
+          ref: master
+
+      - id: compute_shasum
+        env:
+          RUNTIME_PROFILE: 'TESTING'
+        run: |
+          export RUNTIME_CODE_SHASUM=`scripts/runtime-code-shasum.sh`
+          echo "::set-output name=shasum::${RUNTIME_CODE_SHASUM}"
+
+      - name: Setup cache directory
+        run: mkdir ~/docker-images
+
+      - name: Cache docker images
+        uses: actions/cache@v3
+        env:
+          cache-name: joystream-node-docker-image-master
+        with:
+          path: ~/docker-images
+          key: ${{ env.cache-name }}-${{ steps.compute_shasum.outputs.shasum }}
+
+      - name: Check if we have cached image
+        continue-on-error: true
+        run: |
+          if [ -f ~/docker-images/joystream-node-docker-image-master.tar.gz ]; then
+            docker load --input ~/docker-images/joystream-node-docker-image-master.tar.gz
+            cp ~/docker-images/joystream-node-docker-image-master.tar.gz .
+          fi
+
+      - name: Check if we have pre-built image on Dockerhub
+        continue-on-error: true
+        run: |
+          if ! [ -f joystream-node-docker-image-master.tar.gz ]; then
+            docker pull joystream/node:${{ steps.compute_shasum.outputs.shasum }}
+            docker image tag joystream/node:${{ steps.compute_shasum.outputs.shasum }} joystream/node:mainnetDev
+            docker save --output joystream-node-docker-image-master.tar joystream/node:mainnetDev
+            gzip joystream-node-docker-image.tar
+            cp joystream-node-docker-image-master.tar.gz ~/docker-images/
+          fi
+
+      - name: Check we now have an image
+        id: check_master_image
+        uses: andstor/file-existence-action@v1
+        with:
+          files: 'joystream-node-docker-image-master.tar.gz'
+
+      - name: Set up Docker Buildx master
+        uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 # v1.7
+        id: builder2
+        if: steps.check_master_image.outputs.files_exists == 'false'
+
+      - name: Build master image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: joystream-node.Dockerfile
+          platforms: linux/amd64
+          build-args: |
+            CARGO_FEATURES=testing-runtime
+            CODE_SHASUM=${{ steps.compute_shasum_master.outputs.shasum }}
+          push: false
+          tags: joystream/node:mainnetDev
+          builder: ${{ steps.builder2.outputs.name }}
+          load: true
+        if: steps.check_master_image.outputs.files_exists == 'false'
+
+      - name: Save joystream/node image to cache
+        run: |
+          docker save --output joystream-node-docker-image-master.tar joystream/node:mainnetDev
+          gzip joystream-node-docker-image-master.tar
+          cp joystream-node-docker-image-master.tar.gz ~/docker-images/
+        if: steps.check_master_image.outputs.files_exists == 'false'
+
+      - name: Save joystream/node image (master) to Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.compute_shasum.outputs.shasum }}-joystream-node-docker-image.tar.gz
+          path: joystream-node-docker-image-master.tar.gz
+
   runtime_upgrade:
-    # Re-Enable when we want to test carthage runtime updates
-    if: ${{ false }}
-    name: Runtime Upgrade From Carthage Spec 0
-    needs: build_images
+    name: Runtime Upgrade From production runtime
+    needs: [build_master_testing, build_images]
+    if: github.ref != 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: '14.x'
-      - name: Get artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ needs.build_images.outputs.use_artifact }}
       - name: Install artifacts
+        uses: actions/download-artifact@v3
+      - name: load docker images
         run: |
-          docker load --input joystream-node-docker-image.tar.gz
+          docker load --input ${{needs.build_images.outputs.use_artifact}}/*
+          docker load --input ${{needs.build_master_testing.outputs.use_artifact}}/*
           docker images
       - name: Install packages and dependencies
         run: |
           yarn build:packages
       - name: Ensure tests are runnable
         run: yarn workspace network-tests build
       - name: Execute network tests
+        env:
+          RUNTIME: mainnetDev
+          TARGET_RUNTIME: latest
         run: |
           export HOME=${PWD}
           mkdir -p ${HOME}/.local/share/joystream-cli
           yarn joystream-cli api:setUri ws://localhost:9944
-          # Rhodes release (spec 7) production runtime profile
-          export RUNTIME_TAG=e3f72ac0dbfc3d8dc69b63c2ab991f104411f205
-          export TARGET_RUNTIME_TAG=latest
-          tests/network-tests/run-migration-tests.sh
+          tests/network-tests/run-runtime-upgrade-tests.sh

.github/workflows/storage-node.yml

@@ -19,6 +19,7 @@ jobs:
         yarn install --frozen-lockfile
         yarn workspace @joystream/types build
         yarn workspace @joystream/metadata-protobuf build
+        yarn workspace @joystream/js build
         yarn workspace query-node-root build
         yarn workspace storage-node build
 
@@ -39,5 +40,6 @@ jobs:
         yarn install --frozen-lockfile --network-timeout 120000
         yarn workspace @joystream/types build
         yarn workspace @joystream/metadata-protobuf build
+        yarn workspace @joystream/js build
         yarn workspace query-node-root build
         yarn workspace storage-node build

bin/node/Cargo.toml

@@ -3,7 +3,7 @@ authors = ['Joystream contributors']
 build = 'build.rs'
 edition = '2018'
 name = 'joystream-node'
-version = '8.1.0'
+version = '8.3.0'
 default-run = "joystream-node"
 
 [[bin]]