diff options
| author | Dmitry Misharov <dmitry@openssl.org> | 2025-01-02 15:32:41 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2025-01-09 15:32:20 +0100 |
| commit | ea71f8cd40358bf11f2ef9a256bf99c5929379fb (patch) | |
| tree | 80ad5e10fa9761d7777a2da2bf38be4d0539ce3d | |
| parent | Fix memory leaks from missing checks of return value from sk_OPENSSL_STRING_p... (diff) | |
| download | openssl-ea71f8cd40358bf11f2ef9a256bf99c5929379fb.tar.xz openssl-ea71f8cd40358bf11f2ef9a256bf99c5929379fb.zip | |
Replace self-hosted runners with GitHub hosted
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26304)
| -rw-r--r-- | .github/workflows/ci.yml | 58 | ||||
| -rw-r--r-- | .github/workflows/os-zoo.yml | 44 |
2 files changed, 86 insertions, 16 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0a8d56135..b8abd8b424 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,13 +126,8 @@ jobs: name: "ci@basic-clang" path: artifacts.tar.gz - 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 @@ -142,13 +137,56 @@ 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: .github/workflows/make-test - name: save artifacts uses: actions/upload-artifact@v4 with: - name: "ci@self-hosted-${{ matrix.os }}" + name: "ci@linux-arm64" + path: artifacts.tar.gz + + 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 + - name: save artifacts + uses: actions/upload-artifact@v4 + with: + name: "ci@BSD-x86_64" path: artifacts.tar.gz minimal: @@ -410,7 +448,7 @@ jobs: - name: Enable sctp run: sudo modprobe sctp - name: Enable auth in sctp - run: sudo sysctl -w net.sctp.auth_enable=1 + run: sudo sysctl -w net.sctp.auth_enable=1 - name: install extra config support run: sudo apt-get -y install libsctp-dev abigail-tools libzstd-dev zstd - name: config diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml index e4e1e28210..f517cbd6d3 100644 --- a/.github/workflows/os-zoo.yml +++ b/.github/workflows/os-zoo.yml @@ -159,12 +159,8 @@ jobs: working-directory: _build run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4 - self-hosted: - 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 @@ -194,3 +190,39 @@ jobs: ./util/opensslwrap.sh version -c - name: make test run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + + 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 |