Skip to content

Commit a9ffcdb

Browse files
Fix ubuntu aarch64 metadata not being found when building images (#306)
1 parent fe76dc9 commit a9ffcdb

File tree

1 file changed

+39
-38
lines changed

1 file changed

+39
-38
lines changed

.github/workflows/create-channel.yml

+39-38
Original file line numberDiff line numberDiff line change
@@ -53,40 +53,41 @@ jobs:
5353
run: aws s3 cp ./.github/workflows/linux-container-ci.sh s3://aws-crt-test-stuff/ci/${{ steps.tag.outputs.release_tag }}/linux-container-ci.sh
5454

5555
standard-images:
56-
name: ${{ matrix.variant }}
56+
name: ${{ matrix.variant.name }}
5757
runs-on: ubuntu-latest
5858
strategy:
5959
fail-fast: false
6060
matrix:
6161
variant:
62-
- manylinux1-x86
63-
- manylinux1-x64
64-
- manylinux2014-x86
65-
- manylinux2014-x64
66-
- manylinux2014-aarch64
67-
- musllinux-1-1-aarch64
68-
- musllinux-1-1-x64
69-
- al2012-x64
70-
- al2-x64
71-
- ubuntu-18-x64
72-
- ubuntu-20-x64
73-
- ubuntu-20-aarch64
74-
- ubuntu-22-x64
75-
- node-10-linux-x64
76-
- swift-5-al2-x64
77-
- swift-5-centos-x64
78-
- swift-5-ubuntu-x64
79-
- rhel8-x64
80-
- opensuse-leap
81-
- fedora-34-x64
82-
- raspbian-bullseye
83-
- alpine-3.16-x64
84-
- alpine-3.16-x86
85-
- alpine-3.16-arm64
86-
- alpine-3.16-armv7
87-
- alpine-3.16-armv6
88-
- openwrt-x64-openjdk8
89-
62+
- name: manylinux1-x86
63+
- name: manylinux1-x64
64+
- name: manylinux2014-x86
65+
- name: manylinux2014-x64
66+
- name: manylinux2014-aarch64
67+
- name: musllinux-1-1-aarch64
68+
- name: musllinux-1-1-x64
69+
- name: al2012-x64
70+
- name: al2-x64
71+
- name: ubuntu-18-x64
72+
- name: ubuntu-20-x64
73+
- name: ubuntu-20-aarch64
74+
extra-build-flag: --platform=linux/aarch64
75+
- name: ubuntu-22-x64
76+
- name: node-10-linux-x64
77+
- name: swift-5-al2-x64
78+
- name: swift-5-centos-x64
79+
- name: swift-5-ubuntu-x64
80+
- name: rhel8-x64
81+
- name: opensuse-leap
82+
- name: fedora-34-x64
83+
- name: raspbian-bullseye
84+
- name: alpine-3.16-x64
85+
- name: alpine-3.16-x86
86+
- name: alpine-3.16-arm64
87+
- name: alpine-3.16-armv7
88+
- name: alpine-3.16-armv6
89+
- name: openwrt-x64-openjdk8
90+
9091
steps:
9192
- name: Checkout Sources
9293
uses: actions/checkout@v4
@@ -99,29 +100,29 @@ jobs:
99100
run: aws ecr get-login-password --region us-east-1 | docker login ${{ secrets.AWS_ECR_REPO }} -u AWS --password-stdin
100101

101102
- name: Install entrypoint
102-
run: cat .github/docker-images/entrypoint.sh | sed s/version=LATEST/version=${{ steps.tag.outputs.release_tag }}/ > .github/docker-images/${{ matrix.variant }}/entrypoint.sh
103+
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
103104

104105
- name: Install qemu/docker
105106
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
106107

107-
- name: Build ${{ matrix.variant }} image
108+
- name: Build ${{ matrix.variant.name }} image
108109
uses: whoan/docker-build-with-cache-action@v8
109110
with:
110111
registry: ${{ secrets.AWS_ECR_REPO }}
111112
username: ${{ secrets.AWS_ACCESS_KEY_ID }}
112113
password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
113-
image_name: aws-crt-${{ matrix.variant }}
114+
image_name: aws-crt-${{ matrix.variant.name }}
114115
image_tag: ${{ steps.tag.outputs.release_tag }}
115-
context: .github/docker-images/${{ matrix.variant }}
116-
build_extra_args: --compress=true
116+
context: .github/docker-images/${{ matrix.variant.name }}
117+
build_extra_args: --compress=true ${{ matrix.variant.extra-build-flag }}
117118

118119
- name: Create ECR repo if necessary
119120
run: |
120-
if ! aws --region us-east-1 ecr describe-repositories --repository-names aws-crt-${{ matrix.variant }} > /dev/null 2>&1; then \
121-
aws --region us-east-1 ecr create-repository --repository-name aws-crt-${{ matrix.variant }}; \
121+
if ! aws --region us-east-1 ecr describe-repositories --repository-names aws-crt-${{ matrix.variant.name }} > /dev/null 2>&1; then \
122+
aws --region us-east-1 ecr create-repository --repository-name aws-crt-${{ matrix.variant.name }}; \
122123
fi
123124
124-
- name: Export ${{ matrix.variant }} image to ECR
125+
- name: Export ${{ matrix.variant.name }} image to ECR
125126
run: |
126127
export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
127-
docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant }}:$IMAGE_TAG
128+
docker push ${{ secrets.AWS_ECR_REPO }}/aws-crt-${{ matrix.variant.name }}:$IMAGE_TAG

0 commit comments

Comments
 (0)