Skip to content

Commit 5521aa5

Browse files
authored
Merge pull request #270 from evoskuil/master
Regenerate artifacts.
2 parents 64e94cb + 61a6ce4 commit 5521aa5

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,35 +77,35 @@ jobs:
7777
packager: "apt"
7878
packages: ""
7979

80-
- os: macos-13
80+
- os: macos-latest
8181
cxx: "clang++"
8282
link: "dynamic"
8383
optimization: "size"
8484
assert: "ndebug"
8585
coverage: "nocov"
8686
boost: "--build-boost"
87-
icu: "--with-icu"
87+
icu: ""
8888
zmq: "--build-zmq"
8989
cc: "clang"
9090
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
9191
options: "--enable-isystem"
9292
packager: "brew"
9393
packages: "icu4c"
9494

95-
- os: macos-13
95+
- os: macos-latest
9696
cxx: "clang++"
9797
link: "static"
9898
optimization: "size"
9999
assert: "ndebug"
100100
coverage: "nocov"
101101
boost: "--build-boost"
102-
icu: "--build-icu --with-icu"
102+
icu: ""
103103
zmq: "--build-zmq"
104104
cc: "clang"
105105
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
106106
options: "--enable-isystem"
107107
packager: "brew"
108-
packages: ""
108+
packages: "icu4c"
109109

110110

111111
runs-on: ${{ matrix.os }}
@@ -309,35 +309,35 @@ jobs:
309309
packager: "apt"
310310
packages: ""
311311

312-
- os: macos-13
312+
- os: macos-latest
313313
cxx: "clang++"
314314
link: "dynamic"
315315
optimization: "size"
316316
assert: "ndebug"
317317
coverage: "nocov"
318318
boost: "--build-boost"
319-
icu: "--with-icu"
319+
icu: ""
320320
zmq: "--build-zmq"
321321
cc: "clang"
322322
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
323323
options: ""
324324
packager: "brew"
325325
packages: "icu4c"
326326

327-
- os: macos-13
327+
- os: macos-latest
328328
cxx: "clang++"
329329
link: "static"
330330
optimization: "size"
331331
assert: "ndebug"
332332
coverage: "nocov"
333333
boost: "--build-boost"
334-
icu: "--build-icu --with-icu"
334+
icu: ""
335335
zmq: "--build-zmq"
336336
cc: "clang"
337337
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
338338
options: ""
339339
packager: "brew"
340-
packages: ""
340+
packages: "icu4c"
341341

342342

343343
runs-on: ${{ matrix.os }}

install-cmake.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
6969

7070
# Boost archive.
7171
#------------------------------------------------------------------------------
72-
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.78.0/boost_1_78_0.tar.bz2"
72+
BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2"
7373
BOOST_ARCHIVE="boost_1_78_0.tar.bz2"
7474

7575

install-cmakepresets.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
7575

7676
# Boost archive.
7777
#------------------------------------------------------------------------------
78-
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.78.0/boost_1_78_0.tar.bz2"
78+
BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2"
7979
BOOST_ARCHIVE="boost_1_78_0.tar.bz2"
8080

8181

@@ -738,14 +738,9 @@ cmake_tests()
738738

739739
# Build and run unit tests relative to the primary directory.
740740
# VERBOSE=1 ensures test runner output sent to console (gcc).
741-
make -j"$JOBS" test "VERBOSE=1"
741+
CTEST_OUTPUT_ON_FAILURE=ON make -j"$JOBS" test "VERBOSE=1"
742742
local RESULT=$?
743743

744-
# Test runners emit to the test.log file.
745-
if [[ -e "test.log" ]]; then
746-
cat "test.log"
747-
fi
748-
749744
if [[ $RESULT -ne 0 ]]; then
750745
exit $RESULT
751746
fi

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"
6969

7070
# Boost archive.
7171
#------------------------------------------------------------------------------
72-
BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.78.0/boost_1_78_0.tar.bz2"
72+
BOOST_URL="https://archives.boost.io/release/1.78.0/source/boost_1_78_0.tar.bz2"
7373
BOOST_ARCHIVE="boost_1_78_0.tar.bz2"
7474

7575

0 commit comments

Comments
 (0)