Skip to content

Commit

Permalink
Merge pull request #270 from evoskuil/master
Browse files Browse the repository at this point in the history
Regenerate artifacts.
  • Loading branch information
evoskuil authored Jul 26, 2024
2 parents 64e94cb + 61a6ce4 commit 5521aa5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,35 +77,35 @@ jobs:
packager: "apt"
packages: ""

- os: macos-13
- os: macos-latest
cxx: "clang++"
link: "dynamic"
optimization: "size"
assert: "ndebug"
coverage: "nocov"
boost: "--build-boost"
icu: "--with-icu"
icu: ""
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: "--enable-isystem"
packager: "brew"
packages: "icu4c"

- os: macos-13
- os: macos-latest
cxx: "clang++"
link: "static"
optimization: "size"
assert: "ndebug"
coverage: "nocov"
boost: "--build-boost"
icu: "--build-icu --with-icu"
icu: ""
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: "--enable-isystem"
packager: "brew"
packages: ""
packages: "icu4c"


runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -309,35 +309,35 @@ jobs:
packager: "apt"
packages: ""

- os: macos-13
- os: macos-latest
cxx: "clang++"
link: "dynamic"
optimization: "size"
assert: "ndebug"
coverage: "nocov"
boost: "--build-boost"
icu: "--with-icu"
icu: ""
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: ""
packager: "brew"
packages: "icu4c"

- os: macos-13
- os: macos-latest
cxx: "clang++"
link: "static"
optimization: "size"
assert: "ndebug"
coverage: "nocov"
boost: "--build-boost"
icu: "--build-icu --with-icu"
icu: ""
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: ""
packager: "brew"
packages: ""
packages: "icu4c"


runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"

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


Expand Down
9 changes: 2 additions & 7 deletions install-cmakepresets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"

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


Expand Down Expand Up @@ -738,14 +738,9 @@ cmake_tests()

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

# Test runners emit to the test.log file.
if [[ -e "test.log" ]]; then
cat "test.log"
fi

if [[ $RESULT -ne 0 ]]; then
exit $RESULT
fi
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ ZMQ_ARCHIVE="zeromq-4.3.5.tar.gz"

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


Expand Down

0 comments on commit 5521aa5

Please sign in to comment.