From a7ece761d4883e29107f73dd330ab55bef5f34ad Mon Sep 17 00:00:00 2001 From: Dmitry Misharov Date: Wed, 13 Nov 2024 15:35:43 +0100 Subject: [PATCH] remove ternary from runs-on, security repo is hosted on github.com Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25939) (cherry picked from commit 5c5b8d2d7c59fc48981861629bb0b75a03497440) --- .github/workflows/ci.yml | 40 +++++++++++++--------------- .github/workflows/cross-compiles.yml | 2 +- .github/workflows/windows.yml | 6 ++--- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1a5eaee563..0f4d6efb66a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ permissions: jobs: check_update: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - name: install unifdef run: | @@ -42,7 +42,7 @@ jobs: run: git diff --exit-code check_docs: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -60,7 +60,7 @@ jobs: # We are not as strict with libraries, but rather adapt to what's # expected to be available in a certain version of each platform. check-ansi: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -69,7 +69,7 @@ jobs: run: make -s -j4 basic_gcc: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: localegen @@ -82,7 +82,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} basic_clang: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -113,7 +113,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} minimal: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -124,7 +124,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} no-deprecated: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -135,7 +135,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} no-shared-ubuntu: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -150,7 +150,6 @@ jobs: fail-fast: false matrix: os: [macos-13, macos-14] - if: github.server_url == 'https://github.com' runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -162,7 +161,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} non-caching: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Adjust ASLR for sanitizer @@ -177,7 +176,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 TESTS="-test_fuzz* -test_ssl_* -test_sslapi -test_evp -test_cmp_http -test_verify -test_cms -test_store -test_enc -[01][0-9]" address_ub_sanitizer: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Adjust ASLR for sanitizer @@ -192,7 +191,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 memory_sanitizer: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Adjust ASLR for sanitizer @@ -208,7 +207,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 threads_sanitizer: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Adjust ASLR for sanitizer @@ -223,7 +222,7 @@ jobs: run: make V=1 TESTS="test_threads test_internal_provider test_provfetch test_provider test_pbe test_evp_kdf test_pkcs12 test_store test_evp" test HARNESS_JOBS=${HARNESS_JOBS:-4} enable_non-default_options: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: modprobe tls @@ -236,7 +235,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} fips_and_ktls: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: modprobe tls @@ -249,7 +248,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} no-legacy: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -260,7 +259,7 @@ jobs: run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} legacy: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: config @@ -287,7 +286,7 @@ jobs: # - That building, testing and installing works with a read-only source # tree out-of-readonly-source-and-install-ubuntu: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: @@ -319,7 +318,6 @@ jobs: matrix: os: [macos-13, macos-14] runs-on: ${{ matrix.os }} - if: github.server_url == 'https://github.com' steps: - uses: actions/checkout@v4 with: @@ -346,7 +344,7 @@ jobs: working-directory: ./build external-tests: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: @@ -375,7 +373,7 @@ jobs: run: make test TESTS="test_external_oqsprovider" external-test-pyca: - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest strategy: matrix: RUST: diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml index 91bfeabed99..44d5bed3886 100644 --- a/.github/workflows/cross-compiles.yml +++ b/.github/workflows/cross-compiles.yml @@ -148,7 +148,7 @@ jobs: tests: none } ] - runs-on: ${{ github.server_url == 'https://github.com' && 'ubuntu-latest' || 'ubuntu-22.04-self-hosted' }} + runs-on: ubuntu-latest steps: - name: install package repository if: matrix.platform.ppa != '' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2e0f4fe0c90..9d9e8ea47f0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -25,7 +25,7 @@ jobs: config: enable-fips - arch: win32 config: --strict-warnings no-fips - runs-on: ${{ github.server_url == 'https://github.com' && matrix.os || format('{0}-self-hosted', matrix.os) }} + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 @@ -61,7 +61,7 @@ jobs: os: - windows-2019 - windows-2022 - runs-on: ${{ github.server_url == 'https://github.com' && matrix.os || format('{0}-self-hosted', matrix.os) }} + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 @@ -85,7 +85,7 @@ jobs: os: - windows-2019 - windows-2022 - runs-on: ${{ github.server_url == 'https://github.com' && matrix.os || format('{0}-self-hosted', matrix.os) }} + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 -- 2.47.2