File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -28,13 +28,13 @@ jobs:
2828 strategy :
2929 fail-fast : false
3030 matrix :
31- # arch is to tag docker images for uniqueness
32- host :
33- - { name: 'ubuntu-22.04', arch: '' }
3431 container :
3532 - { version: '22.04', codename: 'jammy' }
33+ platform :
34+ - ' linux/amd64'
35+ - ' linux/arm64/v8' # Apple Silicon Linux support
3636
37- runs-on : ${{ matrix.host.name }}
37+ runs-on : ubuntu-22.04
3838
3939 permissions :
4040 packages : write
5353 if [[ "${GITHUB_REF}" != "refs/heads/master" ]] ; then
5454 test_name="test-${BRANCH_NAME////_}-"
5555 fi
56- echo "IMAGE_NAME=ghcr.io/lifting-bits/cxx-common/${test_name}vcpkg-builder-ubuntu-${{ env.IMAGE_VER }}:${{ matrix.container.version }}${{ matrix.host.arch }} " >> ${GITHUB_ENV}
56+ echo "IMAGE_NAME=ghcr.io/lifting-bits/cxx-common/${test_name}vcpkg-builder-ubuntu-${{ env.IMAGE_VER }}:${{ matrix.container.version }}" >> ${GITHUB_ENV}
5757
5858 - name : Build image
5959 working-directory : docker
6363
6464 docker build -f Dockerfile.ubuntu.vcpkg \
6565 --no-cache \
66+ --platform "${{ matrix.platform }}" \
6667 --target caching \
6768 --build-arg "DISTRO_VERSION=${{ matrix.container.codename }}" \
6869 -t "${IMAGE_NAME}" \
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ set -euo pipefail
99IMAGE_VER=v2
1010
1111# Ubuntu versions to build
12- UBUNTU_VERSION_MATRIX=( " focal " " jammy" )
12+ UBUNTU_VERSION_MATRIX=( " jammy" )
1313
1414for version in " ${UBUNTU_VERSION_MATRIX[@]} " ; do
1515 # Always pull from upstream
You can’t perform that action at this time.
0 commit comments