develop <-> eth-rollup-develop alignment (#686)

should be merge after #674
gasp-xyz · Feb 7, 2024 · 71abd93 · 71abd93
2 parents 01f6e9c + d258178
commit 71abd93
Show file tree

Hide file tree

Showing 67 changed files with 2,314 additions and 2,369 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,5 @@
 *
-
+./target/
 !/target/release/polkadot-collator
 !/docker-cargo/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.compact.compressed.wasm
 !/docker-cargo/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.compact.compressed.wasm.md5

diff --git a/.github/workflows/branch-main.yml b/.github/workflows/branch-main.yml
@@ -62,9 +62,9 @@ jobs:
     outputs:
       DOCKER_IMAGE_DIGEST: ${{ steps.export_docker_image.outputs.DOCKER_IMAGE_DIGEST }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -76,10 +76,10 @@ jobs:
           docker save mangatasolutions/mangata-node:${{ needs.init.outputs.RELEASE_CANDIDATE_VERSION }} -o docker-${{ needs.init.outputs.RELEASE_VERSION }}.tar
           zip -r docker-${{ needs.init.outputs.RELEASE_VERSION }}.zip docker-${{ needs.init.outputs.RELEASE_VERSION }}.tar
           # Save docker image SHA256 digest as an output variable
-          echo "DOCKER_IMAGE_DIGEST=$(docker inspect mangatasolutions/mangata-node:${{ needs.init.outputs.RELEASE_CANDIDATE_VERSION }} --format='{{index .RepoDigests 0}}')" >> $GITHUB_OUTPUT
+          echo "DOCKER_IMAGE_DIGEST=$(docker inspect mangatasolutions/mangata-node:${{ needs.init.outputs.RELEASE_CANDIDATE_VERSION }} --format='{{index .RepoDigests 0}}' | sed 's|mangatasolutions/mangata-node@||')" >> $GITHUB_OUTPUT
       
       - name: Tag and push image rococo and kusama specific images
-        uses: akhilerm/tag-push-action@v2.0.0
+        uses: akhilerm/tag-push-action@v2.1.0
         with:
           src: docker.io/mangatasolutions/mangata-node:${{ needs.init.outputs.RELEASE_CANDIDATE_VERSION }}
           dst: |
@@ -156,7 +156,7 @@ jobs:
       - name: Tag and push image
         uses: akhilerm/[email protected]
         with:
-          src: ${{ needs.create-draft-release-and-publish-docker-images.outputs.DOCKER_IMAGE_DIGEST }}
+          src: mangatasolutions/mangata-node@${{ needs.create-draft-release-and-publish-docker-images.outputs.DOCKER_IMAGE_DIGEST }}
           dst: docker.io/mangatasolutions/mangata-node:${{ needs.init.outputs.RELEASE_VERSION }}
 
       - name: Upload wasms to release page

diff --git a/.github/workflows/branch-release.yml → .github/workflows/branch-rc.yml b/.github/workflows/branch-release.yml → .github/workflows/branch-rc.yml
@@ -1,4 +1,4 @@
-name: Release branch workflow
+name: Release Candidate branch workflow
 
 # available flags:
 ## skip-e2e-tests: skip running e2e tests
@@ -46,6 +46,7 @@ jobs:
       GIT_BRANCH: ${{ steps.set_vars.outputs.GIT_BRANCH }}
       RELEASE_BRANCH_PATTERN: ${{ steps.set_vars.outputs.RELEASE_BRANCH_PATTERN }}
       RELEASE_TAG: ${{ steps.set_vars.outputs.RELEASE_TAG }}
+      GIT_BRANCH_UNFORMATTED: ${{ steps.branch-name.outputs.current_branch }}
     steps:
       - name: Get branch name
         id: branch-name
@@ -114,9 +115,19 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           env: pr-${{ github.event.number }}
 
+  generate-types:
+    name: Generate types
+    needs: [ init, build-and-test ]
+    uses: ./.github/workflows/reusable-generate-types.yml
+    secrets: inherit
+    with:
+      branch: ${{ needs.init.outputs.GIT_BRANCH_UNFORMATTED }}
+      parachainDocker: ${{ github.event.inputs.parachainDocker }}
+      globalVersion: ${{ needs.init.outputs.GLOBAL_VERSION }}
+
   run-e2e-test:
     name: Run e2e tests
-    needs: [init, validate-branch-name, build-and-test]
+    needs: [init, validate-branch-name, build-and-test, generate-types]
     uses: ./.github/workflows/reusable-e2e-tests.yml
     secrets: inherit
     permissions:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,23 +2,23 @@ name: Deploy docs
 
 on:
   push:
-    branches: [ develop ]
+    branches: [develop]
 
 jobs:
   docs:
     permissions:
       contents: write
       id-token: write
-    runs-on: mangata-node-e2e-runners
+    runs-on: [compile-gke]
     container:
-      image: mangatasolutions/node-builder:multi-nightly-2022-11-21
+      image: mangatasolutions/node-builder:multi-nightly-2023-05-22
     steps:
-      - uses: actions/checkout@v3
-      - uses: google-github-actions/auth@v1
+      - uses: actions/checkout@v4
+
+      - uses: google-github-actions/auth@v2
         with:
           workload_identity_provider: '${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}'
           service_account: '${{ secrets.GCP_SERVICE_ACCOUNT }}'
-
       - name: Cache the Cargo dependencies
         uses: mansagroup/[email protected]
         with:
@@ -34,7 +34,7 @@ jobs:
         run: cargo doc
 
       - name: Deploy to GCP
-        uses: google-github-actions/upload-cloud-storage@v1.0.3
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
           path: ./target/doc/
           destination: mangata-docs-node