@@ -122,7 +122,7 @@ jobs:
122122
123123 runs-on : # Using '[self-hosted, ..., ...]' does not work for some reason :)
124124 - self-hosted
125- - ${{ matrix.arch }}
125+ - ${{ matrix.arch == null && 'self-hosted' || matrix.arch }}
126126 - ${{ matrix.platform }}
127127
128128 name : |
@@ -131,7 +131,7 @@ jobs:
131131
132132 steps :
133133 - name : Cleanup
134- run : rm -rf ${github.workspace}/{src,build}
134+ run : rm -rf ${{ github.workspace } }/{src,build}
135135
136136 - name : Checkout
137137 uses : actions/checkout@v4
@@ -140,19 +140,22 @@ jobs:
140140 path : src/
141141
142142 - name : Update brew packages
143+ if : ${{ matrix.platform == 'experimental-brew-ci' }}
143144 run : |
144145 brew update
145146 echo "Installing deps: $(brew deps --direct --include-build root)"
146147 brew install ccache googletest pyenv $(brew deps --direct --include-build root)
147148 brew upgrade
148149
149150 - name : Set up python venv
151+ if : ${{ matrix.platform == 'experimental-brew-ci' }}
150152 run : |
151- python3 -m venv ROOT_CI
153+ $(brew --prefix python)/bin/ python3 -m venv ROOT_CI
152154 source ROOT_CI/bin/activate
155+ echo PATH=$PATH >> $GITHUB_PATH
153156 pip install --upgrade pip
154- pip install -r ${{ github.workspace }}/src/requirements.txt
155- echo PATH=$PATH >> $GITHUB_ENV
157+ cat ${{ github.workspace }}/src/requirements.txt | while read PACKAGE; do pip install -U "$PACKAGE"; done || true
158+ pip install openstacksdk # TODO: Remove?
156159
157160 - name : Apply option overrides from matrix for this job for non-release builds
158161 if : ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && matrix.overrides != NaN }}
@@ -170,24 +173,25 @@ jobs:
170173 run : ' echo SSL_CERT_FILE=/opt/local/share/curl/curl-ca-bundle.crt >> $GITHUB_ENV'
171174
172175 - name : Pull Request Build
173- shell : bash -leo pipefail {0}
174176 if : github.event_name == 'pull_request'
175177 env :
176178 HOME : /Users/sftnight
177179 INCREMENTAL : ${{ !contains(github.event.pull_request.labels.*.name, 'clean build') && !matrix.platform == 'mac15' && !matrix.platform == 'mac26'}}
178180 GITHUB_PR_ORIGIN : ${{ github.event.pull_request.head.repo.clone_url }}
179181 OVERRIDES : ${{ join( matrix.overrides, ' ') }}
180- run : " .github/workflows/root-ci-config/build_root.py
181- --buildtype RelWithDebInfo
182- --incremental $INCREMENTAL
183- --base_ref ${{ github.base_ref }}
184- --sha ${{ github.sha }}
185- --pull_repository ${{ github.event.pull_request.head.repo.clone_url }}
186- --head_ref refs/pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }}
187- --head_sha ${{ github.event.pull_request.head.sha }}
188- --repository ${{ github.server_url }}/${{ github.repository }}
189- --platform ${{ matrix.platform }}
190- --overrides $GLOBAL_OVERRIDES $OVERRIDES"
182+ run : |
183+ source ROOT_CI/bin/activate
184+ src/.github/workflows/root-ci-config/build_root.py \
185+ --buildtype RelWithDebInfo \
186+ --incremental $INCREMENTAL \
187+ --base_ref ${{ github.base_ref }} \
188+ --sha ${{ github.sha }} \
189+ --pull_repository ${{ github.event.pull_request.head.repo.clone_url }} \
190+ --head_ref refs/pull/${{ github.event.pull_request.number }}/head:${{ github.event.pull_request.head.ref }} \
191+ --head_sha ${{ github.event.pull_request.head.sha }} \
192+ --repository ${{ github.server_url }}/${{ github.repository }} \
193+ --platform ${{ matrix.platform }} \
194+ --overrides $GLOBAL_OVERRIDES $OVERRIDES
191195
192196 - name : Workflow dispatch
193197 shell : bash -leo pipefail {0}
0 commit comments