Skip to content

Commit

Permalink
Allow Ubuntu-14.04 to use node16 instead of node20.
Browse files Browse the repository at this point in the history
macos-11 no longer supported so upgrade to macos-12.
Exclude "install test" and "install test log" from macos build
  • Loading branch information
jonathan-r-thorpe committed Jul 26, 2024
1 parent dd6795f commit cdb06a6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -354,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
Expand All @@ -368,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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/src/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/src/install-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit cdb06a6

Please sign in to comment.