Skip to content

Commit

Permalink
Test the case of using local packages on macOS CI (#635)
Browse files Browse the repository at this point in the history
* Test the case of using local packages on CI

* Remove unused matrix from Linux CI

* Link libarchive

* Add PKG_CONFIG_PATH

* Remove CPM_LOCAL_PACKAGES_ONLY
  • Loading branch information
ken-matsui authored Jun 15, 2022
1 parent 6dc9fe3 commit a778480
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ jobs:
cmake \
-B build \
-G Ninja \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DPOAC_BUILD_TESTING=ON \
-DPOAC_ENABLE_COVERAGE=${{ matrix.coverage }} \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DPOAC_DEPS_DIR=${{ runner.temp }}/libs
- name: Build Poac
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
matrix:
os: [ macos-11, macos-12 ]
build_type: [ Debug, Release ]
use_local: [ on, off ]
env:
CACHE_KEY_PREFIX: v2-${{ github.ref }}-${{ matrix.os }}-${{ matrix.build_type }}
steps:
Expand All @@ -22,6 +23,10 @@ jobs:
- name: Install required libraries
run: brew install openssl ninja boost

- name: Install optional libraries
if: matrix.use_local == 'on'
run: brew install libarchive libgit2 fmt spdlog

- name: Restore & Cache CMake build results
uses: actions/[email protected]
with:
Expand All @@ -33,8 +38,9 @@ jobs:
cmake \
-B build \
-G Ninja \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DPOAC_BUILD_TESTING=ON \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCPM_USE_LOCAL_PACKAGES=${{ matrix.use_local }}
- name: Build Poac
run: ninja
Expand Down

0 comments on commit a778480

Please sign in to comment.