diff --git a/.github/workflows/create-channel.yml b/.github/workflows/create-channel.yml index 735a1358c..a4bd8c25d 100644 --- a/.github/workflows/create-channel.yml +++ b/.github/workflows/create-channel.yml @@ -58,34 +58,35 @@ jobs: strategy: fail-fast: false matrix: - - variant: manylinux1-x86 - - variant: manylinux1-x64 - - variant: manylinux2014-x86 - - variant: manylinux2014-x64 - - variant: manylinux2014-aarch64 - - variant: musllinux-1-1-aarch64 - - variant: musllinux-1-1-x64 - - variant: al2012-x64 - - variant: al2-x64 - - variant: ubuntu-18-x64 - - variant: ubuntu-20-x64 - - variant: ubuntu-20-aarch64 + variant: + - name: manylinux1-x86 + - name: manylinux1-x64 + - name: manylinux2014-x86 + - name: manylinux2014-x64 + - name: manylinux2014-aarch64 + - name: musllinux-1-1-aarch64 + - name: musllinux-1-1-x64 + - name: al2012-x64 + - name: al2-x64 + - name: ubuntu-18-x64 + - name: ubuntu-20-x64 + - name: ubuntu-20-aarch64 extra-build-flag: --platform=linux/aarch64 - - variant: ubuntu-22-x64 - - variant: node-10-linux-x64 - - variant: swift-5-al2-x64 - - variant: swift-5-centos-x64 - - variant: swift-5-ubuntu-x64 - - variant: rhel8-x64 - - variant: opensuse-leap - - variant: fedora-34-x64 - - variant: raspbian-bullseye - - variant: alpine-3.16-x64 - - variant: alpine-3.16-x86 - - variant: alpine-3.16-arm64 - - variant: alpine-3.16-armv7 - - variant: alpine-3.16-armv6 - - variant: openwrt-x64-openjdk8 + - name: ubuntu-22-x64 + - name: node-10-linux-x64 + - name: swift-5-al2-x64 + - name: swift-5-centos-x64 + - name: swift-5-ubuntu-x64 + - name: rhel8-x64 + - name: opensuse-leap + - name: fedora-34-x64 + - name: raspbian-bullseye + - name: alpine-3.16-x64 + - name: alpine-3.16-x86 + - name: alpine-3.16-arm64 + - name: alpine-3.16-armv7 + - name: alpine-3.16-armv6 + - name: openwrt-x64-openjdk8 steps: - name: Checkout Sources @@ -99,12 +100,12 @@ jobs: run: aws ecr get-login-password --region us-east-1 | docker login ${{ secrets.AWS_ECR_REPO }} -u AWS --password-stdin - name: Install entrypoint - run: cat .github/docker-images/entrypoint.sh | sed s/version=LATEST/version=${{ steps.tag.outputs.release_tag }}/ > .github/docker-images/${{ matrix.variant }}/entrypoint.sh + run: cat .github/docker-images/entrypoint.sh | sed s/version=LATEST/version=${{ steps.tag.outputs.release_tag }}/ > .github/docker-images/${{ matrix.variant.name }}/entrypoint.sh - name: Install qemu/docker run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - name: Build ${{ matrix.variant }} image + - name: Build ${{ matrix.variant.name }} image uses: whoan/docker-build-with-cache-action@v8 with: registry: ${{ secrets.AWS_ECR_REPO }} @@ -117,11 +118,11 @@ jobs: - name: Create ECR repo if necessary run: | - if ! aws --region us-east-1 ecr describe-repositories --repository-names aws-crt-${{ matrix.variant }} > /dev/null 2>&1; then \ - aws --region us-east-1 ecr create-repository --repository-name aws-crt-${{ matrix.variant }}; \ + if ! aws --region us-east-1 ecr describe-repositories --repository-names aws-crt-${{ matrix.variant.name }} > /dev/null 2>&1; then \ + aws --region us-east-1 ecr create-repository --repository-name aws-crt-${{ matrix.variant.name }}; \ fi - - name: Export ${{ matrix.variant }} image to ECR + - name: Export ${{ matrix.variant.name }} image to ECR run: | export IMAGE_TAG=${{ steps.tag.outputs.release_tag }} - docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG + docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant.name }}:$IMAGE_TAG