diff options
author | Tomas Mraz <tomas@openssl.org> | 2023-08-25 13:39:09 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2023-08-25 13:39:09 +0200 |
commit | 975f372a6f7ae20e0c4c55a930a6844f2585ee6d (patch) | |
tree | ad0a6d8ee348d1e4c4daf5924959cf481cab9743 | |
parent | 597ff76e2886df55c0f56ea31ddd4b15f9606429 (diff) |
Revert "drop! Make failing tests run on pull request to test"
This reverts commit 86051eb2bb86e3a89e69abfb6419409aa701bcf7.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21843)
-rw-r--r-- | .github/workflows/compiler-zoo.yml | 2 | ||||
-rw-r--r-- | .github/workflows/cross-compiles.yml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/compiler-zoo.yml b/.github/workflows/compiler-zoo.yml index 4f805f3831..f055cf04e4 100644 --- a/.github/workflows/compiler-zoo.yml +++ b/.github/workflows/compiler-zoo.yml @@ -7,7 +7,7 @@ name: Compiler Zoo CI -on: [pull_request] +on: [push] permissions: contents: read diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml index f61d64add8..08f5930c18 100644 --- a/.github/workflows/cross-compiles.yml +++ b/.github/workflows/cross-compiles.yml @@ -183,26 +183,26 @@ jobs: run: make -s -j4 - name: install qemu - if: matrix.platform.tests != 'none' + if: github.event_name == 'push' && matrix.platform.tests != 'none' run: sudo apt-get -yq --force-yes install qemu-user - name: Set QEMU environment - if: matrix.platform.qemucpu != '' + if: github.event_name == 'push' && matrix.platform.qemucpu != '' run: echo "QEMU_CPU=${{ matrix.platform.qemucpu }}" >> $GITHUB_ENV - name: Set OpenSSL caps environment - if: matrix.platform.opensslcapsname != '' + if: github.event_name == 'push' && matrix.platform.opensslcapsname != '' run: echo "OPENSSL_${{ matrix.platform.opensslcapsname }}=\ ${{ matrix.platform.opensslcaps }}" >> $GITHUB_ENV - name: make all tests - if: matrix.platform.tests == '' + if: github.event_name == 'push' && matrix.platform.tests == '' run: | make test HARNESS_JOBS=${HARNESS_JOBS:-4} \ TESTS="-test_afalg" \ QEMU_LD_PREFIX=/usr/${{ matrix.platform.arch }} - name: make some tests - if: matrix.platform.tests != 'none' && matrix.platform.tests != '' + if: github.event_name == 'push' && matrix.platform.tests != 'none' && matrix.platform.tests != '' run: | make test HARNESS_JOBS=${HARNESS_JOBS:-4} \ TESTS="${{ matrix.platform.tests }} -test_afalg" \ |