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

Jump to bottom

ci: Update MacOS dependencies #3447

Merged
merged 8 commits into from
Jul 27, 2024
Merged

ci: Update MacOS dependencies #3447

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e6dd07
ci: Update MacOS dependencies
andiwand Jul 26, 2024
52e1253
rewire python
andiwand Jul 26, 2024
1edf237
try again
andiwand Jul 26, 2024
09703af
and again
andiwand Jul 26, 2024
a54cec7
path
andiwand Jul 26, 2024
3d547d2
pip points to the wrong dir
andiwand Jul 26, 2024
98bfc02
add python executable again
andiwand Jul 26, 2024
48abbec
fix silly
andiwand Jul 26, 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
23 changes: 10 additions & 13 deletions .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ jobs:
INSTALL_DIR: ${{ github.workspace }}/install_acts
DEPENDENCY_DIR: ${{ github.workspace }}/install
ACTS_LOG_FAILURE_THRESHOLD: WARNING
DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8e12bbf.tar.zst
DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8a95213.tar.zst
# Works around an issue where root's RPATH is wrong for tbb, thus won't find it
DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
steps:
Expand All @@ -352,11 +352,9 @@ jobs:
brew install cmake ninja ccache xerces-c
&& wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.zst ${{ env.DEPENDENCY_URL }}
&& mkdir ${{ env.DEPENDENCY_DIR }}
&& ls ${{ env.DEPENDENCY_DIR }}
&& tar -xf deps.tar.zst -C ${{ env.DEPENDENCY_DIR }}
&& ls ${{ env.DEPENDENCY_DIR }}
&& ls ${{ env.DEPENDENCY_DIR }}/python
&& ${{ env.DEPENDENCY_DIR }}/python/3.12.2/bin/python3 -m pip install pyyaml jinja2
&& PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
&& python3 -m pip install pyyaml jinja2

- name: Restore ccache
uses: actions/cache/restore@v4
Expand All @@ -373,17 +371,17 @@ jobs:
# versions such as the one installed via homebrew
run: >
ccache -z
&& source ${{ env.DEPENDENCY_DIR }}/setup.sh
&& PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
&& cmake -B build -S .
-GNinja
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/python/3.12.2/bin/python3
-DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
-DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
-DDD4HEP_DEBUG_CMAKE=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_FLAGS=-Werror
-DCMAKE_CXX_STANDARD=20
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-DCMAKE_PREFIX_PATH=/usr/local/acts
-DACTS_BUILD_EVERYTHING=ON
-DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-DACTS_BUILD_ODD=ON
Expand Down Expand Up @@ -413,7 +411,7 @@ jobs:
path: ${{ env.INSTALL_DIR }}
- name: Downstream configure
run: >
source ${{ env.DEPENDENCY_DIR }}/setup.sh
PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
&& cmake -B build-downstream -S Tests/DownstreamProject
-GNinja
-DCMAKE_BUILD_TYPE=Release
Expand All @@ -423,7 +421,6 @@ jobs:
- name: Downstream build
run: cmake --build build-downstream
- name: Downstream run
run: |
source ${{ env.DEPENDENCY_DIR }}/setup.sh
source ${{ env.DEPENDENCY_DIR}}/dd4hep/*/bin/thisdd4hep.sh
./build-downstream/bin/ShowActsVersion
run: >
PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
&& ./build-downstream/bin/ShowActsVersion
Loading