From 1dd7e0ec2092d886cc4bda0ef50028e81c26f1d3 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Sat, 11 Nov 2023 17:39:13 +0700 Subject: [PATCH] ci: fix digest name and test new runner --- .github/workflows/release-docker-image.yml | 6 +++--- .github/workflows/tests-build-image.yml | 2 +- .github/workflows/tests-build-js.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-docker-image.yml b/.github/workflows/release-docker-image.yml index d5b8a2373af..45aee435e37 100644 --- a/.github/workflows/release-docker-image.yml +++ b/.github/workflows/release-docker-image.yml @@ -18,6 +18,7 @@ on: description: Image target. i.e. drive-abci, dapi required: true env: + DIGEST_NAME: digests-${{ github.sha }} DIGEST_DIR_PATH: /tmp/digests/${{ inputs.image_org }}/${{ inputs.image_name }} jobs: @@ -78,7 +79,7 @@ jobs: - name: Upload digest uses: actions/upload-artifact@v3 with: - name: digests + name: ${{ env.DIGEST_NAME }} path: ${{ env.DIGEST_DIR_PATH }}/* if-no-files-found: error retention-days: 1 @@ -91,7 +92,7 @@ jobs: - name: Download digests uses: actions/download-artifact@v3 with: - name: digests + name: ${{ env.DIGEST_NAME }} path: ${{ env.DIGEST_DIR_PATH }} - name: Set up Docker Buildx @@ -147,7 +148,6 @@ jobs: - name: Create manifest list and push working-directory: ${{ env.DIGEST_DIR_PATH }} run: | - ls -lah docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ $(printf '${{ inputs.image_org }}/${{ inputs.image_name }}@sha256:%s ' *) diff --git a/.github/workflows/tests-build-image.yml b/.github/workflows/tests-build-image.yml index bcf6e0351d2..ee2862f5142 100644 --- a/.github/workflows/tests-build-image.yml +++ b/.github/workflows/tests-build-image.yml @@ -17,7 +17,7 @@ on: jobs: build-image: name: Build ${{ inputs.name }} image - runs-on: [ "self-hosted", "linux", "arm64", "ubuntu-platform" ] + runs-on: [ "self-hosted", "linux", "arm64-4x", "ubuntu-platform" ] steps: - name: Check out repo uses: actions/checkout@v4 diff --git a/.github/workflows/tests-build-js.yml b/.github/workflows/tests-build-js.yml index 285a379625c..bb4d5e7a57c 100644 --- a/.github/workflows/tests-build-js.yml +++ b/.github/workflows/tests-build-js.yml @@ -4,7 +4,7 @@ on: jobs: build-js: name: Build JS - runs-on: [ "self-hosted", "linux", "arm64", "ubuntu-platform" ] + runs-on: [ "self-hosted", "linux", "arm64-4x", "ubuntu-platform" ] steps: - name: Configure AWS credentials and bucket region uses: aws-actions/configure-aws-credentials@v4