Skip to content

Commit cdb06a6

Browse files
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
1 parent dd6795f commit cdb06a6

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

.github/workflows/build-test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ jobs:
354354
echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV
355355
356356
- name: install test
357+
if: runner.os != 'macOS'
357358
uses: lukka/[email protected]
358359
with:
359360
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
@@ -368,6 +369,7 @@ jobs:
368369
${{ env.CMAKE_COMPILER_ARGS }}'
369370

370371
- name: install test log
372+
if: runner.os != 'macOS'
371373
run: |
372374
# dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt
373375
cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt

.github/workflows/src/build-test.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on: [pull_request, push]
1010
env:
1111
SECRET_GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
1212
SECRET_RESULTS_SHEET_ID: ${{ secrets.RESULTS_SHEET_ID }}
13+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
1314
jobs:
1415
build_and_test:
1516
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:
159160
# ubuntu-14.04 ca-certificates are out of date
160161
git config --global http.sslVerify false
161162
# build and install openssl
162-
curl -OsSk https://www.openssl.org/source/openssl-1.1.1v.tar.gz
163+
curl -OsSk https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz
163164
tar xzf openssl-1.1.1v.tar.gz
164165
cd openssl-1.1.1v
165166
./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl

.github/workflows/src/install-test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV
66
77
- name: install test
8+
if: runner.os != 'macOS'
89
uses: lukka/[email protected]
910
with:
1011
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
@@ -19,6 +20,7 @@
1920
${{ env.CMAKE_COMPILER_ARGS }}'
2021

2122
- name: install test log
23+
if: runner.os != 'macOS'
2224
run: |
2325
# dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt
2426
cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt

0 commit comments

Comments
 (0)