From 294cb0c0b1ef81a1188a4788049f6758ad73eedd Mon Sep 17 00:00:00 2001 From: Viktor Szakats <commit@vsz.me> Date: Wed, 1 Nov 2023 11:40:16 +0000 Subject: [PATCH] reorder 4 --- .github/workflows/build.yml | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d60ea3ba..e0f47d7aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,17 +47,15 @@ jobs: *-*-linux*.* urls.txt - linux-glibc-debian-bookworm-llvm: + linux-glibc-debian-testing-gcc: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux' + export CW_CONFIG='${{ github.ref_name }}-linux-gcc' export CW_REVISION='${{ github.sha }}' - DOCKER_IMAGE='debian:bookworm-slim' - export CW_CCSUFFIX='-15' - export CW_GCCSUFFIX='-12' + . ./_versions.sh docker trust inspect --pretty "${DOCKER_IMAGE}" time docker pull "${DOCKER_IMAGE}" docker images --digests @@ -71,21 +69,23 @@ jobs: run: cat urls.txt - uses: actions/upload-artifact@v3 with: - name: 'curl-linux-glibc-debian-bookworm-llvm' + name: 'curl-linux-glibc-debian-testing-gcc' retention-days: 5 path: | *-*-linux*.* urls.txt - linux-glibc-debian-testing-gcc: + linux-glibc-debian-bookworm-llvm: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux-gcc' + export CW_CONFIG='${{ github.ref_name }}-linux' export CW_REVISION='${{ github.sha }}' - . ./_versions.sh + DOCKER_IMAGE='debian:bookworm-slim' + export CW_CCSUFFIX='-15' + export CW_GCCSUFFIX='-12' docker trust inspect --pretty "${DOCKER_IMAGE}" time docker pull "${DOCKER_IMAGE}" docker images --digests @@ -99,7 +99,7 @@ jobs: run: cat urls.txt - uses: actions/upload-artifact@v3 with: - name: 'curl-linux-glibc-debian-testing-gcc' + name: 'curl-linux-glibc-debian-bookworm-llvm' retention-days: 5 path: | *-*-linux*.* @@ -163,17 +163,15 @@ jobs: *-*-linux*.* urls.txt - linux-musl-debian-bookworm-llvm: + linux-musl-debian-testing-gcc: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux-musl' + export CW_CONFIG='${{ github.ref_name }}-linux-musl-gcc' export CW_REVISION='${{ github.sha }}' - DOCKER_IMAGE='debian:bookworm-slim' - export CW_CCSUFFIX='-15' - export CW_GCCSUFFIX='-12' + . ./_versions.sh docker trust inspect --pretty "${DOCKER_IMAGE}" time docker pull "${DOCKER_IMAGE}" docker images --digests @@ -187,21 +185,23 @@ jobs: run: cat urls.txt - uses: actions/upload-artifact@v3 with: - name: 'curl-linux-musl-debian-bookworm-llvm' + name: 'curl-linux-musl-debian-testing-gcc' retention-days: 5 path: | *-*-linux*.* urls.txt - linux-musl-debian-testing-gcc: + linux-musl-debian-bookworm-llvm: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux-musl-gcc' + export CW_CONFIG='${{ github.ref_name }}-linux-musl' export CW_REVISION='${{ github.sha }}' - . ./_versions.sh + DOCKER_IMAGE='debian:bookworm-slim' + export CW_CCSUFFIX='-15' + export CW_GCCSUFFIX='-12' docker trust inspect --pretty "${DOCKER_IMAGE}" time docker pull "${DOCKER_IMAGE}" docker images --digests @@ -215,7 +215,7 @@ jobs: run: cat urls.txt - uses: actions/upload-artifact@v3 with: - name: 'curl-linux-musl-debian-testing-gcc' + name: 'curl-linux-musl-debian-bookworm-llvm' retention-days: 5 path: | *-*-linux*.*