From 3105b865963879acf0ddcadafc217588d21eda4f Mon Sep 17 00:00:00 2001 From: jonathan-r-thorpe <64410119+jonathan-r-thorpe@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:42:22 +0100 Subject: [PATCH] Fix Ubuntu 14.04 and MacOS runners in GitHub actions (#401) * Allow Ubuntu-14.04 to use node16 instead of node20. macos-11 no longer supported so upgrade to macos-12. * Exclude "install test" and "install test log" from macos build --- .github/workflows/build-test.yml | 19 ++++++++++++------- .github/workflows/src/build-test.yml | 3 ++- .github/workflows/src/install-test.yml | 2 ++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 337d7511..fd83c511 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -10,6 +10,7 @@ on: [pull_request, push] env: SECRET_GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} SECRET_RESULTS_SHEET_ID: ${{ secrets.RESULTS_SHEET_ID }} + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: build_and_test: name: '${{ matrix.os }}: build and test (install mdns: ${{ matrix.install_mdns }}, use conan: ${{ matrix.use_conan }}, force cpprest asio: ${{ matrix.force_cpprest_asio }}, dns-sd mode: ${{ matrix.dns_sd_mode}}, enable_authorization: ${{ matrix.enable_authorization }})' @@ -17,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-11, windows-2019] + os: [ubuntu-20.04, macos-12, windows-2019] install_mdns: [false, true] use_conan: [true] force_cpprest_asio: [false] @@ -25,18 +26,18 @@ jobs: enable_authorization: [false, true] exclude: # install_mdns is only meaningful on Linux - - os: macos-11 + - os: macos-12 enable_authorization: false - os: windows-2019 enable_authorization: false - os: ubuntu-20.04 enable_authorization: false - - os: macos-11 + - os: macos-12 install_mdns: true - os: windows-2019 install_mdns: true # for now, unicast DNS-SD tests are only implemented on Linux - - os: macos-11 + - os: macos-12 dns_sd_mode: unicast - os: windows-2019 dns_sd_mode: unicast @@ -353,6 +354,7 @@ jobs: echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV - name: install test + if: runner.os != 'macOS' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -367,6 +369,7 @@ jobs: ${{ env.CMAKE_COMPILER_ARGS }}' - name: install test log + if: runner.os != 'macOS' run: | # dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt @@ -643,7 +646,7 @@ jobs: # ubuntu-14.04 ca-certificates are out of date git config --global http.sslVerify false # build and install openssl - curl -OsSk https://www.openssl.org/source/openssl-1.1.1v.tar.gz + curl -OsSk https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz tar xzf openssl-1.1.1v.tar.gz cd openssl-1.1.1v ./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl @@ -909,6 +912,7 @@ jobs: echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV - name: install test + if: runner.os != 'macOS' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -923,6 +927,7 @@ jobs: ${{ env.CMAKE_COMPILER_ARGS }}' - name: install test log + if: runner.os != 'macOS' run: | # dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt @@ -1172,8 +1177,8 @@ jobs: - name: make badges run: | - # combine badges from all builds, exclude macos-11 - ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11_auth macos-11_noauth + # combine badges from all builds, exclude macos-12 + ${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-12_auth macos-12_noauth # force push to github onto an orphan 'badges' branch cd ${{ github.workspace }} diff --git a/.github/workflows/src/build-test.yml b/.github/workflows/src/build-test.yml index 42427397..bae4d361 100644 --- a/.github/workflows/src/build-test.yml +++ b/.github/workflows/src/build-test.yml @@ -10,6 +10,7 @@ on: [pull_request, push] env: SECRET_GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }} SECRET_RESULTS_SHEET_ID: ${{ secrets.RESULTS_SHEET_ID }} + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: build_and_test: name: '${{ matrix.os }}: build and test (install mdns: ${{ matrix.install_mdns }}, use conan: ${{ matrix.use_conan }}, force cpprest asio: ${{ matrix.force_cpprest_asio }}, dns-sd mode: ${{ matrix.dns_sd_mode}}, enable_authorization: ${{ matrix.enable_authorization }})' @@ -159,7 +160,7 @@ jobs: # ubuntu-14.04 ca-certificates are out of date git config --global http.sslVerify false # build and install openssl - curl -OsSk https://www.openssl.org/source/openssl-1.1.1v.tar.gz + curl -OsSk https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz tar xzf openssl-1.1.1v.tar.gz cd openssl-1.1.1v ./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl diff --git a/.github/workflows/src/install-test.yml b/.github/workflows/src/install-test.yml index fb8dde85..95926816 100644 --- a/.github/workflows/src/install-test.yml +++ b/.github/workflows/src/install-test.yml @@ -5,6 +5,7 @@ echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV - name: install test + if: runner.os != 'macOS' uses: lukka/run-cmake@v3.4 with: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced @@ -19,6 +20,7 @@ ${{ env.CMAKE_COMPILER_ARGS }}' - name: install test log + if: runner.os != 'macOS' run: | # dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt