Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate artifacts with macos-13. #268

Merged
merged 2 commits into from
May 23, 2024
Merged

Regenerate artifacts with macos-13. #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a611280
Regenerate artifacts with macos-13.
pmienk May 16, 2024
2736463
Regenerate artifacts.
pmienk May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
packager: "apt"
packages: ""

- os: macos-latest
- os: macos-13
cxx: "clang++"
link: "dynamic"
optimization: "size"
Expand All @@ -87,12 +87,12 @@ jobs:
icu: "--with-icu"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: "--enable-isystem"
packager: "brew"
packages: "icu4c"

- os: macos-latest
- os: macos-13
cxx: "clang++"
link: "static"
optimization: "size"
Expand All @@ -102,7 +102,7 @@ jobs:
icu: "--build-icu --with-icu"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: "--enable-isystem"
packager: "brew"
packages: ""
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:

- name: Coveralls.io Upload
if: ${{ matrix.coverage == 'cov' }}
uses: coverallsapp/github-action@v2.2.3
uses: coverallsapp/github-action@v2.3.0
with:
format: lcov
files: "./coverage.info"
Expand Down Expand Up @@ -227,11 +227,12 @@ jobs:


- name: Failure display otool output
if: ${{ failure() && (matrix.os == 'macos-latest') }}
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
run: |
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test

- name: Failure display DYLD_PRINT_LIBRARIES
if: ${{ failure() && (matrix.os == 'macos-latest') }}
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
run: |
DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test

Expand Down Expand Up @@ -308,7 +309,7 @@ jobs:
packager: "apt"
packages: ""

- os: macos-latest
- os: macos-13
cxx: "clang++"
link: "dynamic"
optimization: "size"
Expand All @@ -318,12 +319,12 @@ jobs:
icu: "--with-icu"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: ""
packager: "brew"
packages: "icu4c"

- os: macos-latest
- os: macos-13
cxx: "clang++"
link: "static"
optimization: "size"
Expand All @@ -333,7 +334,7 @@ jobs:
icu: "--build-icu --with-icu"
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
options: ""
packager: "brew"
packages: ""
Expand Down Expand Up @@ -421,7 +422,7 @@ jobs:

- name: Coveralls.io Upload
if: ${{ matrix.coverage == 'cov' }}
uses: coverallsapp/github-action@v2.2.3
uses: coverallsapp/github-action@v2.3.0
with:
format: lcov
files: "./coverage.info"
Expand Down Expand Up @@ -461,11 +462,12 @@ jobs:


- name: Failure display otool output
if: ${{ failure() && (matrix.os == 'macos-latest') }}
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
run: |
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test

- name: Failure display DYLD_PRINT_LIBRARIES
if: ${{ failure() && (matrix.os == 'macos-latest') }}
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
run: |
DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test

Expand Down Expand Up @@ -624,7 +626,7 @@ jobs:

- name: Coveralls.io Upload
if: ${{ matrix.coverage == 'cov' }}
uses: coverallsapp/github-action@v2.2.3
uses: coverallsapp/github-action@v2.3.0
with:
format: lcov
files: "./coverage.info"
Expand Down Expand Up @@ -664,11 +666,12 @@ jobs:


- name: Failure display otool output
if: ${{ failure() && (matrix.os == 'macos-latest') }}
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
run: |
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test

- name: Failure display DYLD_PRINT_LIBRARIES
if: ${{ failure() && (matrix.os == 'macos-latest') }}
if: ${{ failure() && startsWith(matrix.os, 'macos') }}
run: |
DYLD_PRINT_LIBRARIES=1 ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test

Expand Down
12 changes: 6 additions & 6 deletions install-cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ unpack_from_tarball()
local COMPRESSION=$3
local BUILD=$4

display_heading_message "Prepairing to aquire $ARCHIVE"
display_heading_message "Preparing to acquire $ARCHIVE"

if [[ ! ($BUILD) ]]; then
display_message "Skipping unpack of $ARCHIVE..."
Expand Down Expand Up @@ -585,7 +585,7 @@ build_from_tarball()
return
fi

display_heading_message "Prepairing to build $ARCHIVE"
display_heading_message "Preparing to build $ARCHIVE"

# Because ICU tools don't know how to locate internal dependencies.
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
Expand Down Expand Up @@ -643,7 +643,7 @@ create_from_github()

FORK="$ACCOUNT/$REPO"

display_heading_message "Prepairing to aquire $FORK/$BRANCH"
display_heading_message "Preparing to acquire $FORK/$BRANCH"

if [[ -d "$REPO" ]]; then
if [[ true ]]; then
Expand Down Expand Up @@ -678,7 +678,7 @@ build_from_github()
# Join generated and command line options.
local CONFIGURATION=("${OPTIONS[@]}" "$@")

display_heading_message "Prepairing to build $REPO"
display_heading_message "Preparing to build $REPO"

# Build the local repository clone.
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
Expand Down Expand Up @@ -746,7 +746,7 @@ build_from_github_cmake()
# Join generated and command line options.
local CONFIGURATION=("${OPTIONS[@]}" "$@")

display_heading_message "Prepairing to build $REPO"
display_heading_message "Preparing to build $REPO"

# Build the local repository clone.
cmake_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
Expand Down Expand Up @@ -832,7 +832,7 @@ build_from_tarball_boost()
return
fi

display_heading_message "Prepairing to build $ARCHIVE"
display_heading_message "Preparing to build $ARCHIVE"

local TARGET="build-$ARCHIVE"

Expand Down
12 changes: 6 additions & 6 deletions install-cmakepresets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ unpack_from_tarball()
local COMPRESSION=$3
local BUILD=$4

display_heading_message "Prepairing to aquire $ARCHIVE"
display_heading_message "Preparing to acquire $ARCHIVE"

if [[ ! ($BUILD) ]]; then
display_message "Skipping unpack of $ARCHIVE..."
Expand Down Expand Up @@ -631,7 +631,7 @@ build_from_tarball()
return
fi

display_heading_message "Prepairing to build $ARCHIVE"
display_heading_message "Preparing to build $ARCHIVE"

# Because ICU tools don't know how to locate internal dependencies.
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
Expand Down Expand Up @@ -689,7 +689,7 @@ create_from_github()

FORK="$ACCOUNT/$REPO"

display_heading_message "Prepairing to aquire $FORK/$BRANCH"
display_heading_message "Preparing to acquire $FORK/$BRANCH"

if [[ -d "$REPO" ]]; then
if [[ true ]]; then
Expand Down Expand Up @@ -724,7 +724,7 @@ build_from_github()
# Join generated and command line options.
local CONFIGURATION=("${OPTIONS[@]}" "$@")

display_heading_message "Prepairing to build $REPO"
display_heading_message "Preparing to build $REPO"

# Build the local repository clone.
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
Expand Down Expand Up @@ -800,7 +800,7 @@ build_from_github_cmake()
# Join generated and command line options.
local CONFIGURATION=("${OPTIONS[@]}" "$@")

display_heading_message "Prepairing to build $REPO"
display_heading_message "Preparing to build $REPO"

# Build the local repository clone.
cmake_project_directory "$REPO" "$PRESET" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
Expand Down Expand Up @@ -886,7 +886,7 @@ build_from_tarball_boost()
return
fi

display_heading_message "Prepairing to build $ARCHIVE"
display_heading_message "Preparing to build $ARCHIVE"

local TARGET="build-$ARCHIVE"

Expand Down
10 changes: 5 additions & 5 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ unpack_from_tarball()
local COMPRESSION=$3
local BUILD=$4

display_heading_message "Prepairing to aquire $ARCHIVE"
display_heading_message "Preparing to acquire $ARCHIVE"

if [[ ! ($BUILD) ]]; then
display_message "Skipping unpack of $ARCHIVE..."
Expand Down Expand Up @@ -528,7 +528,7 @@ build_from_tarball()
return
fi

display_heading_message "Prepairing to build $ARCHIVE"
display_heading_message "Preparing to build $ARCHIVE"

# Because ICU tools don't know how to locate internal dependencies.
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
Expand Down Expand Up @@ -586,7 +586,7 @@ create_from_github()

FORK="$ACCOUNT/$REPO"

display_heading_message "Prepairing to aquire $FORK/$BRANCH"
display_heading_message "Preparing to acquire $FORK/$BRANCH"

if [[ -d "$REPO" ]]; then
if [[ true ]]; then
Expand Down Expand Up @@ -621,7 +621,7 @@ build_from_github()
# Join generated and command line options.
local CONFIGURATION=("${OPTIONS[@]}" "$@")

display_heading_message "Prepairing to build $REPO"
display_heading_message "Preparing to build $REPO"

# Build the local repository clone.
make_project_directory "$REPO" "$JOBS" "$TEST" "${CONFIGURATION[@]}"
Expand Down Expand Up @@ -707,7 +707,7 @@ build_from_tarball_boost()
return
fi

display_heading_message "Prepairing to build $ARCHIVE"
display_heading_message "Preparing to build $ARCHIVE"

local TARGET="build-$ARCHIVE"

Expand Down
Loading