Skip to content

Commit

Permalink
ci: Bump macOS dependency version package (acts-project#2993)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulgessinger authored and EleniXoch committed May 6, 2024
1 parent 8713af9 commit 6505369
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,9 @@ jobs:
brew install cmake eigen ninja ccache
&& sudo mkdir /usr/local/acts
&& sudo chown $USER /usr/local/acts
&& wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.gz https://acts.web.cern.ch/ACTS/ci/macOS/deps.67dd08d.tar.gz
&& wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.gz https://acts.web.cern.ch/ACTS/ci/macOS/deps.32bca8c.tar.gz
&& tar -xf deps.tar.gz -C /usr/local/acts
&& python3 -m pip install pyyaml jinja2
&& /usr/local/acts/bin/python3.10 -m pip install pyyaml jinja2
- name: Restore ccache
uses: actions/cache/restore@v3
Expand All @@ -467,7 +467,8 @@ jobs:
cmake -B build -S .
-GNinja
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-DPython_EXECUTABLE=$(command -v python3)
-DPython_EXECUTABLE=/usr/local/acts/bin/python3.10
-DDD4HEP_DEBUG_CMAKE=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=17
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ if(ACTS_BUILD_PLUGIN_CUDA)
endif()
if(ACTS_BUILD_PLUGIN_DD4HEP)
# Explicitly find python so we can more easily override the version
find_package(Python 3.8 REQUIRED COMPONENTS Interpreter)
find_package(Python 3.8 REQUIRED COMPONENTS Interpreter Development)
find_package(DD4hep ${_acts_dd4hep_version} REQUIRED CONFIG COMPONENTS DDCore DDDetectors)
endif()
if(ACTS_BUILD_PLUGIN_JSON)
Expand Down

0 comments on commit 6505369

Please sign in to comment.