Merge branch 'master' into rb-payee-in-rewarded

paritytech · Sep 18, 2023 · 0a5c613 · 0a5c613
2 parents e71d8a8 + a181ced
commit 0a5c613
Show file tree

Hide file tree

Showing 99 changed files with 1,410 additions and 1,460 deletions.
diff --git a/cumulus/.github/ISSUE_TEMPLATE/blank.md → .github/ISSUE_TEMPLATE/blank.md b/cumulus/.github/ISSUE_TEMPLATE/blank.md → .github/ISSUE_TEMPLATE/blank.md
diff --git a/substrate/.github/ISSUE_TEMPLATE/bug.yaml → .github/ISSUE_TEMPLATE/bug_report.yaml b/substrate/.github/ISSUE_TEMPLATE/bug.yaml → .github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: Let us know about an issue you experienced with this software
-# labels: ["some existing label","another one"]
+labels: [ I2-bug, I10-unconfirmed ]
+
 body:
   - type: checkboxes
     attributes:
@@ -20,7 +21,7 @@ body:
     id: bug
     attributes:
       label: Description of bug
-      # description: What seems to be the problem?
+      description: What seems to be the problem?
       # placeholder: Describe the problem.
     validations:
       required: true

diff --git a/substrate/.github/ISSUE_TEMPLATE/config.yml → .github/ISSUE_TEMPLATE/config.yml b/substrate/.github/ISSUE_TEMPLATE/config.yml → .github/ISSUE_TEMPLATE/config.yml
diff --git a/...trate/.github/ISSUE_TEMPLATE/feature.yaml → .github/ISSUE_TEMPLATE/feature.yaml b/...trate/.github/ISSUE_TEMPLATE/feature.yaml → .github/ISSUE_TEMPLATE/feature.yaml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Submit your requests and suggestions to improve!
-labels: ["J0-enhancement"]
+labels: [ I5-enhancement ]
 body:
   - type: checkboxes
     id: existing

diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
@@ -196,10 +196,10 @@ jobs:
           ./docker/scripts/build-injected.sh
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v2
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.CUMULUS_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.CUMULUS_DOCKERHUB_TOKEN }}
 
       - name: Push Container image for ${{ env.BINARY }}
         id: docker_push
@@ -242,7 +242,7 @@ jobs:
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@95cb08cb2672c73d4ffd2f422e6d11953d2a9c70 # v2.1.0
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
       - name: Cache Docker layers
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
@@ -255,8 +255,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.POLKADOT_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.POLKADOT_DOCKERHUB_TOKEN }}
 
       - name: Fetch values
         id: fetch-data
@@ -266,7 +266,7 @@ jobs:
 
       - name: Build and push
         id:   docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #  v5.0.0
         with:
           push: true
           file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile

diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml
@@ -127,7 +127,7 @@ build-implementers-guide:
     - .kubernetes-env
     - .common-refs
     - .run-immediately
-    # - .collect-artifacts
+    - .collect-artifacts
   # git depth is set on purpose: https://github.com/paritytech/polkadot/issues/6284
   variables:
     GIT_STRATEGY: clone

diff --git a/.gitlab/pipeline/publish.yml b/.gitlab/pipeline/publish.yml
@@ -16,6 +16,8 @@ publish-rustdoc:
   needs:
     - job: build-rustdoc
       artifacts: true
+    - job: build-implementers-guide
+      artifacts: true
   script:
     # If $CI_COMMIT_REF_NAME doesn't match one of $RUSTDOCS_DEPLOY_REFS space-separated values, we
     # exit immediately.
@@ -34,15 +36,21 @@ publish-rustdoc:
     - git fetch origin gh-pages
     # Save README and docs
     - cp -r ./crate-docs/ /tmp/doc/
+    - cp -r ./artifacts/book/ /tmp/
     - cp README.md /tmp/doc/
     # we don't need to commit changes because we copy docs to /tmp
     - git checkout gh-pages --force
+    # Enable if docs needed for other refs
     # Install `index-tpl-crud` and generate index.html based on RUSTDOCS_DEPLOY_REFS
-    - which index-tpl-crud &> /dev/null || yarn global add @substrate/index-tpl-crud
-    - index-tpl-crud upsert ./index.html ${CI_COMMIT_REF_NAME}
+    # - which index-tpl-crud &> /dev/null || yarn global add @substrate/index-tpl-crud
+    # - index-tpl-crud upsert ./index.html ${CI_COMMIT_REF_NAME}
     # Ensure the destination dir doesn't exist.
     - rm -rf ${CI_COMMIT_REF_NAME}
+    - rm -rf book/
     - mv -f /tmp/doc ${CI_COMMIT_REF_NAME}
+    # dir for implementors guide
+    - mkdir -p book
+    - mv /tmp/book/html/* book/
     # Upload files
     - git add --all
     # `git commit` has an exit code of > 0 if there is nothing to commit.