Merge branch 'main' into A0-1902-update-to-0.9.33

Author: maciejnems

.github/scripts/run_e2e_test.sh

@@ -113,7 +113,7 @@ fi
 
 if [[ -n "${ADDER:-}" ]]; then
     ARGS+=(-e "ADDER=${ADDER}")
-    ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/metadata.json")
+    ARGS+=(-e "ADDER_METADATA=/contracts/adder/target/ink/adder.json")
 fi
 
 if [[ -n "${OUT_LATENCY:-}" ]]; then

.github/workflows/deploy-testnet.yml

@@ -23,8 +23,8 @@ jobs:
         id: vars
         shell: bash
         run: |
-          echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+          echo "branch=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT
+          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -40,8 +40,6 @@ jobs:
           registry: public.ecr.aws
           username: ${{ secrets.AWS_MAINNET_ACCESS_KEY_ID }}
           password: ${{ secrets.AWS_MAINNET_SECRET_ACCESS_KEY }}
-        env:
-          AWS_REGION: us-east-1
 
       - name: Tag and push image for Testnet
         env:
@@ -82,8 +80,8 @@ jobs:
       - name: S3 CI | Download release runtime from S3 bucket
         shell: bash
         env:
-          S3BUCKET_URL: s3://${{ secrets.CI_MAINNET_S3BUCKET_NAME }}/builds/aleph-node/commits/${{ steps.get_branch.outputs.sha_short }}/aleph-runtime
-          S3BUCKET_FILE: aleph-runtime-${{ steps.get_branch.outputs.sha_short }}.tar.gz
+          S3BUCKET_URL: s3://${{ secrets.CI_MAINNET_S3BUCKET_NAME }}/builds/aleph-node/commits/${{ steps.vars.outputs.sha_short }}/aleph-runtime
+          S3BUCKET_FILE: aleph-runtime-${{ steps.vars.outputs.sha_short }}.tar.gz
         run: |
           aws s3 cp ${{ env.S3BUCKET_URL }}/${{ env.S3BUCKET_FILE }} ${{ env.S3BUCKET_FILE }}
 
@@ -92,7 +90,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            aleph-runtime-${{ steps.get_branch.outputs.sha_short }}.tar.gz
+            aleph-runtime-${{ steps.vars.outputs.sha_short }}.tar.gz
 
       - name: GIT | Checkout aleph-apps repo
         uses: actions/checkout@master

.github/workflows/e2e-tests-main-devnet.yml

@@ -586,10 +586,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install cargo-contract
-        uses: baptiste0928/cargo-install@v1
-        with:
-          crate: cargo-contract
-          version: "2.0.0-beta.1"
+        run: cargo install cargo-contract --version 2.0.0-beta.1
 
       - name: Install rust-src
         working-directory: ./contracts