From f0bee314274ca0befa976ef674d7d819b8535d74 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 26 Aug 2024 22:54:19 +0200 Subject: [PATCH] merge riscv64 jobs into arm/intel testing ones --- .github/workflows/build.yml | 140 ++---------------------------------- .github/workflows/daily.yml | 45 +----------- 2 files changed, 6 insertions(+), 179 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f873eb39c..234b463cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: fetch-depth: '300' - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux' + export CW_CONFIG='${{ github.ref_name }}-linux-a64-r64-x64' export CW_REVISION='${{ github.sha }}' . ./_versions.sh docker trust inspect --pretty "${DOCKER_IMAGE}" @@ -100,7 +100,7 @@ jobs: fetch-depth: '300' - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux-gcc' + export CW_CONFIG='${{ github.ref_name }}-linux-a64-r64-x64-gcc' export CW_REVISION='${{ github.sha }}' . ./_versions.sh export CW_GCCSUFFIX='-14' @@ -189,72 +189,6 @@ jobs: *-*-linux*.* urls.txt - linux-glibc-debian-testing-llvm-riscv64: - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: '300' - - name: 'build' - run: | - export CW_CONFIG='${{ github.ref_name }}-linux-r64' - export CW_REVISION='${{ github.sha }}' - DOCKER_IMAGE='debian:testing-slim' - export CW_CCSUFFIX='-18' - export CW_GCCSUFFIX='-14' - docker trust inspect --pretty "${DOCKER_IMAGE}" - time docker pull "${DOCKER_IMAGE}" - docker images --digests - time docker run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \ - --env-file <(env | grep -a -E \ - '^(CW_|GITHUB_|DO_NOT_TRACK)') \ - "${DOCKER_IMAGE}" \ - sh -c ./_ci-linux-debian.sh - - - name: 'list dependencies' - run: cat urls.txt - - uses: actions/upload-artifact@v4 - with: - name: 'curl-linux-glibc-debian-testing-llvm-riscv64' - retention-days: 5 - path: | - *-*-linux*.* - urls.txt - - linux-glibc-debian-testing-gcc-riscv64: - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: '300' - - name: 'build' - run: | - export CW_CONFIG='${{ github.ref_name }}-linux-gcc-r64' - export CW_REVISION='${{ github.sha }}' - DOCKER_IMAGE='debian:testing-slim' - export CW_CCSUFFIX='-18' - export CW_GCCSUFFIX='-14' - docker trust inspect --pretty "${DOCKER_IMAGE}" - time docker pull "${DOCKER_IMAGE}" - docker images --digests - time docker run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \ - --env-file <(env | grep -a -E \ - '^(CW_|GITHUB_|DO_NOT_TRACK)') \ - "${DOCKER_IMAGE}" \ - sh -c ./_ci-linux-debian.sh - - - name: 'list dependencies' - run: cat urls.txt - - uses: actions/upload-artifact@v4 - with: - name: 'curl-linux-glibc-debian-testing-gcc-riscv64' - retention-days: 5 - path: | - *-*-linux*.* - urls.txt - linux-musl-debian-testing-llvm: runs-on: ubuntu-latest timeout-minutes: 30 @@ -264,7 +198,7 @@ jobs: fetch-depth: '300' - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux-musl' + export CW_CONFIG='${{ github.ref_name }}-linux-a64-r64-x64-musl' export CW_REVISION='${{ github.sha }}' . ./_versions.sh docker trust inspect --pretty "${DOCKER_IMAGE}" @@ -295,7 +229,7 @@ jobs: fetch-depth: '300' - name: 'build' run: | - export CW_CONFIG='${{ github.ref_name }}-linux-musl-gcc' + export CW_CONFIG='${{ github.ref_name }}-linux-a64-r64-x64-musl-gcc' export CW_REVISION='${{ github.sha }}' . ./_versions.sh docker trust inspect --pretty "${DOCKER_IMAGE}" @@ -383,72 +317,6 @@ jobs: *-*-linux*.* urls.txt - linux-musl-debian-testing-llvm-riscv64: - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: '300' - - name: 'build' - run: | - export CW_CONFIG='${{ github.ref_name }}-linux-musl-r64' - export CW_REVISION='${{ github.sha }}' - DOCKER_IMAGE='debian:testing-slim' - export CW_CCSUFFIX='-18' - export CW_GCCSUFFIX='-14' - docker trust inspect --pretty "${DOCKER_IMAGE}" - time docker pull "${DOCKER_IMAGE}" - docker images --digests - time docker run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \ - --env-file <(env | grep -a -E \ - '^(CW_|GITHUB_|DO_NOT_TRACK)') \ - "${DOCKER_IMAGE}" \ - sh -c ./_ci-linux-debian.sh - - - name: 'list dependencies' - run: cat urls.txt - - uses: actions/upload-artifact@v4 - with: - name: 'curl-linux-musl-debian-testing-llvm-riscv64' - retention-days: 5 - path: | - *-*-linux*.* - urls.txt - - linux-musl-debian-testing-gcc-riscv64: - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: '300' - - name: 'build' - run: | - export CW_CONFIG='${{ github.ref_name }}-linux-musl-gcc-r64' - export CW_REVISION='${{ github.sha }}' - DOCKER_IMAGE='debian:testing-slim' - export CW_CCSUFFIX='-18' - export CW_GCCSUFFIX='-14' - docker trust inspect --pretty "${DOCKER_IMAGE}" - time docker pull "${DOCKER_IMAGE}" - docker images --digests - time docker run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \ - --env-file <(env | grep -a -E \ - '^(CW_|GITHUB_|DO_NOT_TRACK)') \ - "${DOCKER_IMAGE}" \ - sh -c ./_ci-linux-debian.sh - - - name: 'list dependencies' - run: cat urls.txt - - uses: actions/upload-artifact@v4 - with: - name: 'curl-linux-musl-debian-testing-gcc-riscv64' - retention-days: 5 - path: | - *-*-linux*.* - urls.txt - linux-musl-alpine-llvm: runs-on: ubuntu-latest timeout-minutes: 30 diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 0e6dcd6aa..58b535d56 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -31,7 +31,7 @@ jobs: env: GITHUB_TOKEN: '${{ github.token }}' run: | - export CW_CONFIG='dev-linux' + export CW_CONFIG='dev-linux-a64-r64-x64' export CW_REVISION="$(TZ=UTC date +'%Y%m%d')" DOCKER_IMAGE='debian:bookworm-slim' export CW_CCSUFFIX='-15' @@ -72,7 +72,7 @@ jobs: env: GITHUB_TOKEN: '${{ github.token }}' run: | - export CW_CONFIG='dev-linux-musl' + export CW_CONFIG='dev-linux-a64-r64-x64-musl' export CW_REVISION="$(TZ=UTC date +'%Y%m%d')" . ./_versions.sh docker trust inspect --pretty "${DOCKER_IMAGE}" @@ -99,47 +99,6 @@ jobs: *-*-linux*.* urls.txt - linux-musl-riscv64: - if: ${{ github.repository_owner == 'curl' }} - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: '300' - - name: 'build' - env: - GITHUB_TOKEN: '${{ github.token }}' - run: | - export CW_CONFIG='dev-linux-musl-r64' - export CW_REVISION="$(TZ=UTC date +'%Y%m%d')" - DOCKER_IMAGE='debian:sid-slim' - export CW_CCSUFFIX='-18' - export CW_GCCSUFFIX='-14' - docker trust inspect --pretty "${DOCKER_IMAGE}" - time docker pull "${DOCKER_IMAGE}" - docker images --digests - time docker run --volume "$(pwd):$(pwd)" --workdir "$(pwd)" \ - --env-file <(env | grep -a -E \ - '^(CW_|GITHUB_|DO_NOT_TRACK)') \ - "${DOCKER_IMAGE}" \ - sh -c ./_ci-linux-debian.sh - - - name: 'list dependencies' - run: cat urls.txt - - uses: actions/upload-artifact@v4 - with: - name: 'curl-linux-musl-riscv64-daily-tool' - retention-days: 42 - path: curl-*-*-*/curl* - - uses: actions/upload-artifact@v4 - with: - name: 'curl-linux-musl-riscv64-daily' - retention-days: 42 - path: | - *-*-linux*.* - urls.txt - mac: if: ${{ github.repository_owner == 'curl' }} runs-on: macos-latest