9999 permissions :
100100 contents : read
101101
102+ env :
103+ VENV_DIR : ${{ github.workspace }}/ROOT_CI_VENV
104+
102105 strategy :
103106 fail-fast : false
104107 matrix :
@@ -110,20 +113,26 @@ jobs:
110113 - platform : mac14
111114 arch : X64
112115 overrides : ["CMAKE_CXX_STANDARD=20"]
116+ run_on : mac14
113117 - platform : mac15
114118 arch : ARM64
119+ run_on : mac15
115120 overrides : ["CMAKE_CXX_STANDARD=23"]
121+ - platform : mac15
122+ arch : ARM64
123+ run_on : experimental-brew-ci
124+ overrides : ["CMAKE_CXX_STANDARD=23", "tmva-sofie=Off"]
116125 - platform : mac26
117126 arch : ARM64
127+ run_on : mac26
118128 - platform : mac-beta
119129 is_special : true
120130 arch : ARM64
131+ run_on : mac-beta
121132
122133 runs-on : # Using '[self-hosted, ..., ...]' does not work for some reason :)
123134 - self-hosted
124- - macOS
125- - ${{ matrix.arch }}
126- - ${{ matrix.platform }}
135+ - ${{ matrix.run_on }}
127136
128137 name : |
129138 ${{ matrix.platform }} ${{ matrix.arch }}
@@ -134,13 +143,27 @@ jobs:
134143 uses : actions/checkout@v4
135144 with :
136145 ref : ${{ inputs.ref_name }}
146+ path : " src/"
137147
138148 - uses : root-project/gcc-problem-matcher-improved@main
139149 with :
140150 build-directory : /Users/sftnight/ROOT-CI/src/
141151
142- - name : Set up curl CA bundle for Davix to work with https
143- run : ' echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV'
152+ - name : Export SSL certificate files for Davix
153+ run : |
154+ for cert in /opt/homebrew/opt/ca-certificates/share/ca-certificates/cacert.pem /opt/local/share/curl/curl-ca-bundle.crt; do
155+ if [ -f ${cert} ]; then
156+ echo "SSL_CERT_FILE=${cert}" >> $GITHUB_ENV
157+ fi
158+ done
159+
160+ - name : Enter Python venv
161+ run : |
162+ if [ -d ${VENV_DIR} ]; then
163+ source ${VENV_DIR}/bin/activate
164+ echo "${PATH}" >> $GITHUB_PATH
165+ echo "VIRTUAL_ENV=${VIRTUAL_ENV}" >> $GITHUB_ENV
166+ fi
144167
145168 - name : Pull Request Build
146169 shell : bash -leo pipefail {0}
@@ -150,7 +173,7 @@ jobs:
150173 INCREMENTAL : ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') && !matrix.platform == 'mac15' && !matrix.platform == 'mac26'}}
151174 GITHUB_PR_ORIGIN : ${{ github.event.pull_request.head.repo.clone_url }}
152175 OVERRIDES : ${{ join( matrix.overrides, ' ') }}
153- run : " .github/workflows/root-ci-config/build_root.py
176+ run : " src/ .github/workflows/root-ci-config/build_root.py
154177 --buildtype RelWithDebInfo
155178 --incremental $INCREMENTAL
156179 --base_ref ${{ github.base_ref }}
0 commit comments