Skip to content

Commit 8b32482

Browse files
committed
Split update step from CI run.
1 parent 24a0ef0 commit 8b32482

File tree

1 file changed

+10
-32
lines changed

1 file changed

+10
-32
lines changed

.github/workflows/root-ci.yml

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,20 @@ jobs:
113113
# - platform: mac14
114114
# arch: X64
115115
# overrides: ["CMAKE_CXX_STANDARD=20"]
116-
- platform: mac15
117-
arch: ARM64
118-
overrides: ["CMAKE_CXX_STANDARD=23"]
116+
#- platform: mac15
117+
# arch: ARM64
118+
# overrides: ["CMAKE_CXX_STANDARD=23"]
119119
- platform: experimental-brew-ci
120120
# arch: ARM64
121121
overrides: ["CMAKE_CXX_STANDARD=23"]
122-
- platform: experimental-brew-ci-2
123-
# arch: ARM64
124-
overrides: ["CMAKE_CXX_STANDARD=23", "tmva-sofie=Off"]
122+
#- platform: experimental-brew-ci-2
123+
# # arch: ARM64
124+
# overrides: ["CMAKE_CXX_STANDARD=23", "tmva-sofie=Off"]
125125
# - platform: mac26
126126
# arch: ARM64
127-
- platform: mac-beta
128-
is_special: true
129-
arch: ARM64
127+
#- platform: mac-beta
128+
# is_special: true
129+
# arch: ARM64
130130

131131
runs-on: # Using '[self-hosted, ..., ...]' does not work for some reason :)
132132
- self-hosted
@@ -147,28 +147,6 @@ jobs:
147147
ref: ${{ inputs.ref_name }}
148148
path: src/
149149

150-
- name: Update brew packages
151-
if: ${{ contains(matrix.platform, 'experimental-brew-ci') }}
152-
run: |
153-
brew update
154-
brew install ccache googletest openjdk pyenv python3
155-
echo "Installing official brew deps: $(brew deps --direct --include-build root)"
156-
brew install $(brew deps --direct --include-build root)
157-
java --version
158-
159-
- name: Set up python venv
160-
if: ${{ contains(matrix.platform, 'experimental-brew-ci') }}
161-
run: |
162-
$(brew --prefix python)/bin/python3 -m venv ${VENV_DIR}
163-
source ${VENV_DIR}/bin/activate
164-
pip install --upgrade pip
165-
cat ${{ github.workspace }}/src/requirements.txt | while read PACKAGE; do
166-
if [ -n "${PACKAGE%%#*}" ]; then
167-
pip install -U "${PACKAGE%%#*}";
168-
fi; done || true
169-
pip install openstacksdk # TODO: Remove?
170-
echo ${VENV_DIR}/bin >> $GITHUB_PATH
171-
172150
- name: Apply option overrides from matrix for this job for non-release builds
173151
if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && matrix.overrides != NaN }}
174152
env:
@@ -181,7 +159,7 @@ jobs:
181159
with:
182160
build-directory: /Users/sftnight/ROOT-CI/src/
183161

184-
- name: Set up curl CA bundle for Davix to work with https
162+
- name: Export SSL certificate files for Davix
185163
run: |
186164
for cert in /opt/homebrew/opt/ca-certificates/share/ca-certificates/cacert.pem /opt/local/share/curl/curl-ca-bundle.crt; do
187165
if [ -f ${cert} ]; then

0 commit comments

Comments
 (0)