Skip to content

Commit fc3d34d

Browse files
committed
CI: split web macOS into separate job (no Docker on macOS runners)
1 parent 0dd448a commit fc3d34d

1 file changed

Lines changed: 28 additions & 14 deletions

File tree

.github/workflows/test.yml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ jobs:
138138

139139
web:
140140
name: Web
141-
runs-on: ${{ matrix.os }}
142-
continue-on-error: ${{ matrix.os == 'macos-latest' }}
141+
runs-on: ubuntu-24.04
143142

144143
services:
145144
postgres:
@@ -156,28 +155,17 @@ jobs:
156155
157156
strategy:
158157
matrix:
159-
os: [ubuntu-24.04, macos-latest]
160158
database: [sqlite, psql_pg8000, psql_psycopg2]
161-
exclude:
162-
- os: macos-latest
163-
database: psql_pg8000
164-
- os: macos-latest
165-
database: psql_psycopg2
166159

167160
steps:
168161
- uses: actions/checkout@v2
169162
- uses: actions/setup-python@v4
170163
with:
171164
python-version: '3.9'
172165

173-
- name: Install dependencies (Linux)
174-
if: runner.os == 'Linux'
166+
- name: Install dependencies
175167
run: sh .github/workflows/install-deps.sh
176168

177-
- name: Install dependencies (macOS)
178-
if: runner.os == 'macOS'
179-
run: sh .github/workflows/install-deps-macos.sh
180-
181169
- name: Init .pgpass
182170
if: matrix.database != 'sqlite'
183171
run: |
@@ -203,6 +191,32 @@ jobs:
203191
working-directory: web
204192
run: make test_unit_cov
205193

194+
web-macos:
195+
name: Web (macOS)
196+
runs-on: macos-latest
197+
continue-on-error: true
198+
199+
steps:
200+
- uses: actions/checkout@v2
201+
- uses: actions/setup-python@v4
202+
with:
203+
python-version: '3.9'
204+
205+
- name: Install dependencies
206+
run: sh .github/workflows/install-deps-macos.sh
207+
208+
- name: Run tests
209+
run: |
210+
make pip_dev_deps
211+
pip3 install -r web/requirements_py/auth/requirements.txt
212+
BUILD_UI_DIST=NO make package
213+
214+
make -C web test_matrix_sqlite
215+
216+
- name: Run unit tests coverage
217+
working-directory: web
218+
run: make test_unit_cov
219+
206220
gui:
207221
name: GUI
208222
runs-on: ubuntu-24.04

0 commit comments

Comments
 (0)