ci: use more unique deploy job name, add steps:

This commit is contained in:
Matt McCormick 2025-02-17 15:37:31 -05:00
parent af6a85faf1
commit 8d3f1362c2

View File

@ -1494,62 +1494,45 @@ jobs:
make ${{ matrix.arch_name.image }}.push make ${{ matrix.arch_name.image }}.push
deploy-multi-arch-images: deploy-multi-arch-images:
name: ${{ matrix.arch_name.image }} needs: ["${{ matrix.image_name }}_on_ubuntu-22.04", "${{ matrix.image_name }}_on_ubuntu-22.04-arm"]
needs: [${{ matrix.arch_name.image }}_on_ubuntu-22.04, ${{ matrix.arch_name.image }}_on_ubuntu-22.04-arm]
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
arch_name: image_name: ["android-arm64", "web-wasm", "web-wasi", "web-wasi-threads"]
- { steps:
image: "android-arm64"
}
- {
image: "web-wasm",
}
- {
image: "web-wasi",
}
- {
image: "web-wasi-threads",
}
- name: checkout code - name: checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: "recursive" submodules: "recursive"
fetch-depth: 1 fetch-depth: 1
- name: set host_arch - name: download ${{ matrix.image_name }}-amd64
run: |
echo "HOST_ARCH=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')" >> $GITHUB_ENV
- name: download ${{ matrix.arch_name.image }}-amd64
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: cache-${{ matrix.arch_name.image }}-amd64 name: cache-${{ matrix.image_name }}-amd64
path: ./cache/${{ matrix.arch_name.image }}-amd64.tar.xz path: ./cache/${{ matrix.image_name }}-amd64.tar.xz
- name: download ${{ matrix.arch_name.image }}-arm64 - name: download ${{ matrix.image_name }}-arm64
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: cache-${{ matrix.arch_name.image }}-arm64 name: cache-${{ matrix.image_name }}-arm64
path: ./cache/${{ matrix.arch_name.image }}-arm64.xz path: ./cache/${{ matrix.image_name }}-arm64.xz
- name: load images - name: load images
run: | run: |
xz -d -k < ./cache/${{ matrix.arch_name.image }}-amd64.tar.xz | docker import - dockcross/${{ matrix.arch_name.image }}-amd64 xz -d -k < ./cache/${{ matrix.image_name }}-amd64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-amd64
xz -d -k < ./cache/${{ matrix.arch_name.image }}-arm64.tar.xz | docker import - dockcross/${{ matrix.arch_name.image }}-arm64 xz -d -k < ./cache/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-arm64
- name: deploy-multi-arch - name: deploy-multi-arch
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
run: | run: |
docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }} docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
make ${{ matrix.arch_name.image }}.tag-amd64 make ${{ matrix.image_name }}.tag-amd64
make ${{ matrix.arch_name.image }}.tag-arm64 make ${{ matrix.image_name }}.tag-arm64
make ${{ matrix.arch_name.image }}.push-amd64 make ${{ matrix.image_name }}.push-amd64
make ${{ matrix.arch_name.image }}.push-arm64 make ${{ matrix.image_name }}.push-arm64
make ${{ matrix.arch_name.image }}.push make ${{ matrix.image_name }}.push