Skip to content

Commit 1e873b2

Browse files
wip
1 parent 46c2903 commit 1e873b2

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

.github/workflows/osx-tests.yml

+26-24
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,6 @@ on:
77
required: true
88
type: string
99

10-
env:
11-
CMAKE_PATHS: |
12-
~/Applications/CMake/3.15.7
13-
~/Applications/CMake/3.19.7
14-
~/Applications/CMake/3.23.5
15-
~/Applications/CMake/3.27.9
16-
~/Applications/CMake/4.0.0-rc3
17-
BAZEL_PATHS: |
18-
~/Applications/bazel/6.5.0
19-
~/Applications/bazel/7.4.1
20-
~/Applications/bazel/8.0.0
21-
PIP_INSTALL_COMMANDS: |
22-
pip install --upgrade pip
23-
pip install -r conans/requirements.txt
24-
pip install -r conans/requirements_server.txt
25-
pip install -r conans/requirements_dev.txt
26-
pip install meson
27-
2810
jobs:
2911
osx_setup:
3012
runs-on: macos-14
@@ -47,7 +29,11 @@ jobs:
4729

4830
- name: Install Python requirements
4931
run: |
50-
${{ env.PIP_INSTALL_COMMANDS }}
32+
pip install --upgrade pip
33+
pip install -r conans/requirements.txt
34+
pip install -r conans/requirements_server.txt
35+
pip install -r conans/requirements_dev.txt
36+
pip install meson
5137
5238
- name: Uninstall default CMake
5339
run: brew uninstall --formula cmake || true
@@ -68,8 +54,14 @@ jobs:
6854
uses: actions/cache@v4
6955
with:
7056
path: |
71-
${{ env.CMAKE_PATHS }}
72-
${{ env.BAZEL_PATHS }}
57+
~/Applications/CMake/3.15.7
58+
~/Applications/CMake/3.19.7
59+
~/Applications/CMake/3.23.5
60+
~/Applications/CMake/3.27.9
61+
~/Applications/CMake/4.0.0-rc3
62+
~/Applications/bazel/6.5.0
63+
~/Applications/bazel/7.4.1
64+
~/Applications/bazel/8.0.0
7365
key: ${{ runner.os }}-conan-tools-cache
7466

7567
- name: Build CMake old versions not available for ARM
@@ -151,8 +143,14 @@ jobs:
151143
uses: actions/cache@v4
152144
with:
153145
path: |
154-
${{ env.CMAKE_PATHS }}
155-
${{ env.BAZEL_PATHS }}
146+
~/Applications/CMake/3.15.7
147+
~/Applications/CMake/3.19.7
148+
~/Applications/CMake/3.23.5
149+
~/Applications/CMake/3.27.9
150+
~/Applications/CMake/4.0.0-rc3
151+
~/Applications/bazel/6.5.0
152+
~/Applications/bazel/7.4.1
153+
~/Applications/bazel/8.0.0
156154
key: ${{ runner.os }}-conan-tools-cache
157155

158156
- name: Set up Python ${{ matrix.python-version }}
@@ -162,7 +160,11 @@ jobs:
162160

163161
- name: Install Python Dependencies
164162
run: |
165-
${{ env.PIP_INSTALL_COMMANDS }}
163+
pip install --upgrade pip
164+
pip install -r conans/requirements.txt
165+
pip install -r conans/requirements_server.txt
166+
pip install -r conans/requirements_dev.txt
167+
pip install meson
166168
167169
- name: Install homebrew dependencies
168170
run: |

0 commit comments

Comments
 (0)