From 2f1fd7cb97cea2c41b64af7dbc197d88302e895d Mon Sep 17 00:00:00 2001 From: Dmitry Misharov Date: Thu, 2 Jan 2025 15:32:41 +0100 Subject: [PATCH] Replace self-hosted runners with GitHub hosted Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/26304) (cherry picked from commit ea71f8cd40358bf11f2ef9a256bf99c5929379fb) --- .github/workflows/ci.yml | 51 +++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0da986b158c..9794b5daa6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,13 +92,8 @@ jobs: - name: make test run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} - self-hosted: - if: github.repository == 'openssl/openssl' - strategy: - matrix: - os: [freebsd-13.2, ubuntu-arm64-22.04] - runs-on: ${{ matrix.os }}-self-hosted - continue-on-error: true + linux-arm64: + runs-on: linux-arm64 steps: - uses: actions/checkout@v4 - name: config @@ -108,9 +103,47 @@ jobs: - name: make run: make -j4 - name: get cpu info - run: ./util/opensslwrap.sh version -c + run: | + cat /proc/cpuinfo + ./util/opensslwrap.sh version -c - name: make test - run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + run: .github/workflows/make-test + + freebsd-x86_64: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: config + uses: cross-platform-actions/action@v0.26.0 + with: + operating_system: freebsd + version: "13.4" + shutdown_vm: false + run: | + sudo pkg install -y gcc perl5 + ./config enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace + - name: config dump + uses: cross-platform-actions/action@v0.26.0 + with: + operating_system: freebsd + version: "13.4" + shutdown_vm: false + run: ./configdata.pm --dump + - name: make + uses: cross-platform-actions/action@v0.26.0 + with: + operating_system: freebsd + version: "13.4" + shutdown_vm: false + run: make -j4 + - name: make test + uses: cross-platform-actions/action@v0.26.0 + with: + operating_system: freebsd + version: "13.4" + run: | + ./util/opensslwrap.sh version -c + .github/workflows/make-test minimal: runs-on: ubuntu-latest -- 2.47.2