Skip to content

Commit 4f3de3e

Browse files
lo-simonlo-simon
committed
Merge branch 'master' into is-14
2 parents 226dc59 + 6d64db8 commit 4f3de3e

File tree

6 files changed

+43
-29
lines changed

6 files changed

+43
-29
lines changed

‎.github/workflows/build-test.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,34 @@ 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 }})'
1617
runs-on: ${{ matrix.os }}
1718
strategy:
1819
fail-fast: false
1920
matrix:
20-
os: [ubuntu-20.04, macos-11, windows-2019]
21+
os: [ubuntu-20.04, macos-12, windows-2019]
2122
install_mdns: [false, true]
2223
use_conan: [true]
2324
force_cpprest_asio: [false]
2425
dns_sd_mode: [multicast, unicast]
2526
enable_authorization: [false, true]
2627
exclude:
2728
# install_mdns is only meaningful on Linux
28-
- os: macos-11
29+
- os: macos-12
2930
enable_authorization: false
3031
- os: windows-2019
3132
enable_authorization: false
3233
- os: ubuntu-20.04
3334
enable_authorization: false
34-
- os: macos-11
35+
- os: macos-12
3536
install_mdns: true
3637
- os: windows-2019
3738
install_mdns: true
3839
# for now, unicast DNS-SD tests are only implemented on Linux
39-
- os: macos-11
40+
- os: macos-12
4041
dns_sd_mode: unicast
4142
- os: windows-2019
4243
dns_sd_mode: unicast
@@ -353,6 +354,7 @@ jobs:
353354
echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV
354355
355356
- name: install test
357+
if: runner.os != 'macOS'
356358
uses: lukka/[email protected]
357359
with:
358360
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
@@ -367,6 +369,7 @@ jobs:
367369
${{ env.CMAKE_COMPILER_ARGS }}'
368370

369371
- name: install test log
372+
if: runner.os != 'macOS'
370373
run: |
371374
# dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt
372375
cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt
@@ -643,7 +646,7 @@ jobs:
643646
# ubuntu-14.04 ca-certificates are out of date
644647
git config --global http.sslVerify false
645648
# build and install openssl
646-
curl -OsSk https://www.openssl.org/source/openssl-1.1.1v.tar.gz
649+
curl -OsSkL https://openssl.org/source/old/1.1.1/openssl-1.1.1v.tar.gz
647650
tar xzf openssl-1.1.1v.tar.gz
648651
cd openssl-1.1.1v
649652
./config --prefix=/usr/local/custom-openssl --libdir=lib --openssldir=/etc/ssl
@@ -909,6 +912,7 @@ jobs:
909912
echo "CMAKE_WORKSPACE=${RUNNER_WORKSPACE//\\/\/}" >> $GITHUB_ENV
910913
911914
- name: install test
915+
if: runner.os != 'macOS'
912916
uses: lukka/[email protected]
913917
with:
914918
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
@@ -923,6 +927,7 @@ jobs:
923927
${{ env.CMAKE_COMPILER_ARGS }}'
924928

925929
- name: install test log
930+
if: runner.os != 'macOS'
926931
run: |
927932
# dump the log file created in Sandbox/my-nmos-node/CMakeLists.txt
928933
cat ${{ env.RUNNER_WORKSPACE }}/build-my-nmos-node/my-nmos-node_include-release.txt
@@ -1172,8 +1177,8 @@ jobs:
11721177

11731178
- name: make badges
11741179
run: |
1175-
# combine badges from all builds, exclude macos-11
1176-
${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11_auth macos-11_noauth
1180+
# combine badges from all builds, exclude macos-12
1181+
${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-12_auth macos-12_noauth
11771182
11781183
# force push to github onto an orphan 'badges' branch
11791184
cd ${{ github.workspace }}

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,34 @@ 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 }})'
1617
runs-on: ${{ matrix.os }}
1718
strategy:
1819
fail-fast: false
1920
matrix:
20-
os: [ubuntu-20.04, macos-11, windows-2019]
21+
os: [ubuntu-20.04, macos-12, windows-2019]
2122
install_mdns: [false, true]
2223
use_conan: [true]
2324
force_cpprest_asio: [false]
2425
dns_sd_mode: [multicast, unicast]
2526
enable_authorization: [false, true]
2627
exclude:
2728
# install_mdns is only meaningful on Linux
28-
- os: macos-11
29+
- os: macos-12
2930
enable_authorization: false
3031
- os: windows-2019
3132
enable_authorization: false
3233
- os: ubuntu-20.04
3334
enable_authorization: false
34-
- os: macos-11
35+
- os: macos-12
3536
install_mdns: true
3637
- os: windows-2019
3738
install_mdns: true
3839
# for now, unicast DNS-SD tests are only implemented on Linux
39-
- os: macos-11
40+
- os: macos-12
4041
dns_sd_mode: unicast
4142
- os: windows-2019
4243
dns_sd_mode: unicast
@@ -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 -OsSkL 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
@@ -204,8 +205,8 @@ jobs:
204205

205206
- name: make badges
206207
run: |
207-
# combine badges from all builds, exclude macos-11
208-
${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-11_auth macos-11_noauth
208+
# combine badges from all builds, exclude macos-12
209+
${{ github.workspace }}/Sandbox/make_badges.sh ${{ github.workspace }} ${{ runner.workspace }}/artifacts macos-12_auth macos-12_noauth
209210
210211
# force push to github onto an orphan 'badges' branch
211212
cd ${{ github.workspace }}

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

Lines changed: 2 additions & 0 deletions
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

‎Development/cpprest/json_ops.h

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,7 @@ namespace web
5151
return !(lhs == rhs);
5252
}
5353

54-
inline bool operator<(const web::json::object& lhs, const web::json::object& rhs)
55-
{
56-
using std::begin;
57-
using std::end;
58-
return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
59-
}
54+
inline bool operator<(const web::json::object& lhs, const web::json::object& rhs);
6055

6156
inline bool operator>(const web::json::object& lhs, const web::json::object& rhs)
6257
{
@@ -87,12 +82,7 @@ namespace web
8782
return !(lhs == rhs);
8883
}
8984

90-
inline bool operator<(const web::json::array& lhs, const web::json::array& rhs)
91-
{
92-
using std::begin;
93-
using std::end;
94-
return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
95-
}
85+
inline bool operator<(const web::json::array& lhs, const web::json::array& rhs);
9686

9787
inline bool operator>(const web::json::array& lhs, const web::json::array& rhs)
9888
{
@@ -142,6 +132,20 @@ namespace web
142132
{
143133
return !(lhs < rhs);
144134
}
135+
136+
inline bool operator<(const web::json::array& lhs, const web::json::array& rhs)
137+
{
138+
using std::begin;
139+
using std::end;
140+
return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
141+
}
142+
143+
inline bool operator<(const web::json::object& lhs, const web::json::object& rhs)
144+
{
145+
using std::begin;
146+
using std::end;
147+
return std::lexicographical_compare(begin(lhs), end(lhs), begin(rhs), end(rhs));
148+
}
145149
}
146150
}
147151

‎Development/nmos/control_protocol_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ namespace nmos
185185
};
186186
auto is_float32 = [](double value)
187187
{
188-
return value >= (std::numeric_limits<float_t>::min)()
188+
return value >= (std::numeric_limits<float_t>::lowest)()
189189
&& value <= (std::numeric_limits<float_t>::max)();
190190
};
191191

‎Development/nmos/test/control_protocol_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,10 +883,12 @@ BST_TEST_CASE(testConstraints)
883883
BST_REQUIRE_NO_THROW(nmos::details::constraints_validation(std::numeric_limits<uint64_t>::max(), value::null(), value::null(), no_constraints_uint64_constraints_validation_params));
884884
// float32 datatype constraints validation
885885
const nmos::details::datatype_constraints_validation_parameters no_constraints_float32_constraints_validation_params{ no_constraints_float32_datatype, nmos::make_get_control_protocol_datatype_descriptor_handler(control_protocol_state) };
886-
BST_REQUIRE_THROW(nmos::details::constraints_validation(std::numeric_limits<double>::min(), value::null(), value::null(), no_constraints_float32_constraints_validation_params), nmos::control_protocol_exception);
886+
BST_REQUIRE_THROW(nmos::details::constraints_validation(std::numeric_limits<double>::lowest(), value::null(), value::null(), no_constraints_float32_constraints_validation_params), nmos::control_protocol_exception);
887887
BST_REQUIRE_THROW(nmos::details::constraints_validation(std::numeric_limits<double>::max(), value::null(), value::null(), no_constraints_float32_constraints_validation_params), nmos::control_protocol_exception);
888-
BST_REQUIRE_NO_THROW(nmos::details::constraints_validation(std::numeric_limits<float_t>::min(), value::null(), value::null(), no_constraints_float32_constraints_validation_params));
888+
BST_REQUIRE_NO_THROW(nmos::details::constraints_validation(std::numeric_limits<float_t>::lowest(), value::null(), value::null(), no_constraints_float32_constraints_validation_params));
889889
BST_REQUIRE_NO_THROW(nmos::details::constraints_validation(std::numeric_limits<float_t>::max(), value::null(), value::null(), no_constraints_float32_constraints_validation_params));
890+
BST_REQUIRE_NO_THROW(nmos::details::constraints_validation(0.0, value::null(), value::null(), no_constraints_float32_constraints_validation_params));
891+
BST_REQUIRE_NO_THROW(nmos::details::constraints_validation(-1000.0, value::null(), value::null(), no_constraints_float32_constraints_validation_params));
890892
// float64 datatype constraints validation
891893
const nmos::details::datatype_constraints_validation_parameters no_constraints_float64_constraints_validation_params{ no_constraints_float64_datatype, nmos::make_get_control_protocol_datatype_descriptor_handler(control_protocol_state) };
892894
BST_REQUIRE_THROW(nmos::details::constraints_validation(1000, value::null(), value::null(), no_constraints_float64_constraints_validation_params), nmos::control_protocol_exception);

0 commit comments

Comments
 (0)