Skip to content

Commit

Permalink
Merge pull request msgpack#1122 from redboltz/fix_ci
Browse files Browse the repository at this point in the history
Updated the boost version to 1.85.0
  • Loading branch information
redboltz authored May 27, 2024
2 parents 5c521bc + a687df0 commit 820ccf1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/depends/boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ while getopts "b:t:p:" c; do
done

mkdir $prefix || exit 1
wget https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2 || exit 1
tar xf boost_1_76_0.tar.bz2 || exit 1
cd boost_1_76_0
wget https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2 || exit 1
tar xf boost_1_85_0.tar.bz2 || exit 1
cd boost_1_85_0
./bootstrap.sh || exit 1

build()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/cache@v1
with:
path: ~/boost-prefix/
key: ${{ runner.os }}-boost-64-1-76-0-2021-08-09
key: ${{ runner.os }}-boost-1-85-0-2024-05-27

- name: Build boost
if: steps.cache-boost.outputs.cache-hit != 'true'
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,26 @@ jobs:
matrix:
pattern: [0, 1, 2, 3, 4]
steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v3
- name: Install Dependencies
brew update
brew install --force llvm

- name: Cache boost
id: cache-boost
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/boost-prefix/
key: ${{ runner.os }}-boost-1-76-0-2022-08-09
key: ${{ runner.os }}-boost-1-85-0-2024-05-27

- name: Build boost
if: steps.cache-boost.outputs.cache-hit != 'true'
run: ./.github/depends/boost.sh -b 64 -t clang -p $HOME/boost-prefix

- name: Cache zlib
id: cache-zlib
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/zlib-prefix/
key: ${{ runner.os }}-zlib-1-2-13-2022-11-02
Expand Down Expand Up @@ -85,7 +89,7 @@ jobs:
matrix:
pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install build dependencies
shell: bash
Expand All @@ -97,18 +101,18 @@ jobs:
- name: Cache boost
id: cache-boost
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/boost-prefix/
key: ${{ runner.os }}-boost-1-76-0-2021-08-09
key: ${{ runner.os }}-boost-1-85-0-2024-05-27

- name: Build boost
if: steps.cache-boost.outputs.cache-hit != 'true'
run: ./.github/depends/boost.sh -b both -t gcc -p $HOME/boost-prefix

- name: Cache zlib
id: cache-zlib
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/zlib-prefix/
key: ${{ runner.os }}-zlib-1-2-13-2022-11-02
Expand Down Expand Up @@ -198,11 +202,11 @@ jobs:
cxx: [14, 17, 20]
pp_flag: ["/Zc:preprocessor-", "/Zc:preprocessor"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache vcpkg dependencies
id: cache-vcpkg
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: C:/vcpkg/installed/x64-windows
key: ${{ runner.os }}-vcpkg-2021-08-09
Expand Down

0 comments on commit 820ccf1

Please sign in to comment.