Skip to content

Commit 54402b0

Browse files
committed
ci: install pip dependencies in 'install_dependencies.sh', cleanup accordingly
1 parent dc1ca82 commit 54402b0

File tree

2 files changed

+21
-27
lines changed

2 files changed

+21
-27
lines changed

.github/scripts/install_dependencies.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,5 @@ sudo apt install -y \
4949
clang-7 \
5050
clang-10
5151
# libtbb-dev
52+
53+
pip install -r requirements.txt

.github/workflows/test.yml

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ jobs:
1919
runs-on: ubuntu-18.04
2020
steps:
2121

22-
- uses: actions/checkout@v2
23-
- run: ./.github/scripts/install_dependencies.sh
2422
- uses: actions/setup-python@v2
2523
with:
2624
python-version: 3.6
27-
- run: pip install -r requirements.txt
25+
- uses: actions/checkout@v2
26+
- run: ./.github/scripts/install_dependencies.sh
2827

2928
- name: Test
3029
env:
@@ -44,12 +43,11 @@ jobs:
4443
name: 'F: ${{ matrix.name }}'
4544
steps:
4645

47-
- uses: actions/checkout@v2
48-
- run: ./.github/scripts/install_dependencies.sh
4946
- uses: actions/setup-python@v2
5047
with:
5148
python-version: 3.6
52-
- run: pip install -r requirements.txt
49+
- uses: actions/checkout@v2
50+
- run: ./.github/scripts/install_dependencies.sh
5351

5452
- name: Test
5553
run: ./dev/${{ matrix.script }}
@@ -60,12 +58,11 @@ jobs:
6058
runs-on: ubuntu-18.04
6159
steps:
6260

63-
- uses: actions/checkout@v2
64-
- run: ./.github/scripts/install_dependencies.sh
6561
- uses: actions/setup-python@v2
6662
with:
6763
python-version: 3.6
68-
- run: pip install -r requirements.txt
64+
- uses: actions/checkout@v2
65+
- run: ./.github/scripts/install_dependencies.sh
6966

7067
- name: Test
7168
env:
@@ -78,12 +75,11 @@ jobs:
7875
runs-on: ubuntu-18.04
7976
steps:
8077

81-
- uses: actions/checkout@v2
82-
- run: ./.github/scripts/install_dependencies.sh
8378
- uses: actions/setup-python@v2
8479
with:
8580
python-version: 3.6
86-
- run: pip install -r requirements.txt
81+
- uses: actions/checkout@v2
82+
- run: ./.github/scripts/install_dependencies.sh
8783

8884
- name: Test
8985
env:
@@ -128,12 +124,11 @@ jobs:
128124
name: 'R: ${{ matrix.name }}'
129125
steps:
130126

131-
- uses: actions/checkout@v2
132-
- run: ./.github/scripts/install_dependencies.sh
133127
- uses: actions/setup-python@v2
134128
with:
135129
python-version: 3.6
136-
- run: pip install -r requirements.txt
130+
- uses: actions/checkout@v2
131+
- run: ./.github/scripts/install_dependencies.sh
137132

138133
- name: Test
139134
env:
@@ -154,12 +149,11 @@ jobs:
154149
name: 'S: ${{ matrix.name }}'
155150
steps:
156151

157-
- uses: actions/checkout@v2
158-
- run: ./.github/scripts/install_dependencies.sh
159152
- uses: actions/setup-python@v2
160153
with:
161154
python-version: 3.6
162-
- run: pip install -r requirements.txt
155+
- uses: actions/checkout@v2
156+
- run: ./.github/scripts/install_dependencies.sh
163157

164158
- name: Test
165159
env:
@@ -171,17 +165,17 @@ jobs:
171165
# We skip QoR since we are only checking for errors in sanitizer runs
172166
./run_reg_test.py ${{ matrix.suite }} -show_failures -j2 -skip_qor
173167
168+
174169
ODINII:
175170
name: 'ODIN-II Basic Tests'
176171
runs-on: ubuntu-18.04
177172
steps:
178173

179-
- uses: actions/checkout@v2
180-
- run: ./.github/scripts/install_dependencies.sh
181174
- uses: actions/setup-python@v2
182175
with:
183176
python-version: 3.6
184-
- run: pip install -r requirements.txt
177+
- uses: actions/checkout@v2
178+
- run: ./.github/scripts/install_dependencies.sh
185179

186180
- name: Test
187181
env:
@@ -209,12 +203,11 @@ jobs:
209203
name: 'B: ${{ matrix.name }}'
210204
steps:
211205

212-
- uses: actions/checkout@v2
213-
- run: ./.github/scripts/install_dependencies.sh
214206
- uses: actions/setup-python@v2
215207
with:
216208
python-version: 3.6
217-
- run: pip install -r requirements.txt
209+
- uses: actions/checkout@v2
210+
- run: ./.github/scripts/install_dependencies.sh
218211

219212
- name: Test
220213
env:
@@ -238,12 +231,11 @@ jobs:
238231
runs-on: ubuntu-18.04
239232
steps:
240233

241-
- uses: actions/checkout@v2
242-
- run: ./.github/scripts/install_dependencies.sh
243234
- uses: actions/setup-python@v2
244235
with:
245236
python-version: 3.6
246-
- run: pip install -r requirements.txt
237+
- uses: actions/checkout@v2
238+
- run: ./.github/scripts/install_dependencies.sh
247239

248240
- name: Test
249241
env:

0 commit comments

Comments
 (0)