diff --git a/.github/workflows/checkdocs.yml b/.github/workflows/checkdocs.yml index ac0d9ad2be..bda9767be2 100644 --- a/.github/workflows/checkdocs.yml +++ b/.github/workflows/checkdocs.yml @@ -160,7 +160,7 @@ jobs: run: .github/scripts/verify-examples.pl docs/libcurl/curl*.3 docs/libcurl/opts/*.3 miscchecks: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm timeout-minutes: 5 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index eb3854f256..44d9bb6460 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -62,7 +62,7 @@ env: jobs: linux: name: ${{ matrix.build.generate && 'CM' || 'AM' }} ${{ matrix.build.name }} - runs-on: 'ubuntu-24.04' + runs-on: ${{ matrix.build.image || 'ubuntu-24.04' }} container: ${{ matrix.build.container }} timeout-minutes: 45 strategy: @@ -164,6 +164,12 @@ jobs: install_steps: pytest configure: CFLAGS=-std=gnu89 --with-openssl --enable-debug + - name: openssl arm + install_packages: zlib1g-dev + install_steps: pytest + configure: CFLAGS=-std=gnu89 --with-openssl --enable-debug + image: 'ubuntu-24.04-arm' + - name: openssl -O3 valgrind install_packages: zlib1g-dev valgrind configure: CPPFLAGS=-DCURL_WARN_SIGN_CONVERSION CFLAGS=-O3 --with-openssl --enable-debug @@ -700,6 +706,8 @@ jobs: CURL_CI: github PYTEST_ADDOPTS: "--color=yes" run: | + echo "CANARY:|${HOME}|${PATH}|" + PATH="${PATH//\/home\/runneradmin/${HOME}}" # workaround for PATH issue on ubuntu-24.04-arm [ -x "$HOME/venv/bin/activate" ] && source $HOME/venv/bin/activate if [ -n '${{ matrix.build.generate }}' ]; then cmake --build . --verbose --target curl-pytest-ci diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index 280ef2e387..ccaaba337f 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -37,7 +37,7 @@ permissions: {} jobs: netbsd: - name: 'NetBSD (CM, openssl, clang)' + name: 'NetBSD (CM, openssl, clang, ${{ matrix.arch }})' runs-on: ubuntu-latest timeout-minutes: 10 strategy: @@ -77,7 +77,7 @@ jobs: echo '::endgroup::' openbsd: - name: 'OpenBSD (CM, libressl, clang)' + name: 'OpenBSD (CM, libressl, clang, ${{ matrix.arch }})' runs-on: ubuntu-latest timeout-minutes: 10 strategy: