Skip to content

Commit 298f205

Browse files
committed
Refactor workflow
1 parent f7be6f3 commit 298f205

File tree

1 file changed

+60
-71
lines changed

1 file changed

+60
-71
lines changed

.github/workflows/test-installers.yml

Lines changed: 60 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -21,85 +21,72 @@ on:
2121

2222
jobs:
2323
test:
24-
name: '${{ matrix.test }} test ${{ matrix.format }} on ${{ matrix.platform.name }} (${{ matrix.platform.arch }})'
24+
name: ${{ matrix.test }} test of ${{ matrix.package }}
2525
strategy:
2626
fail-fast: false
2727
matrix:
2828
test:
2929
- time-to-first-query
3030
- auto-update-from
31-
platform:
32-
- name: windows
33-
arch: x64
34-
runs-on: windows-latest
35-
hadron-platform: windows
36-
- name: osx
37-
arch: x64
31+
package:
32+
- osx_dmg
33+
- osx_zip
34+
#- windows_zip
35+
#- windows_msi
36+
#- windows_setup
37+
#- linux_tar
38+
#- linux_deb
39+
#- linux_rpm
40+
hadron-distribution:
41+
- compass
42+
include:
43+
# MacOS
44+
- package: osx_dmg
3845
runs-on: macos-13
46+
arch: x64
3947
hadron-platform: darwin
40-
- name: osx
41-
arch: arm64
48+
- package: osx_zip
4249
runs-on: macos-latest
50+
arch: arm64
4351
hadron-platform: darwin
44-
- name: linux
45-
arch: x64
46-
runs-on: ubuntu-latest
47-
hadron-platform: linux
48-
test_command_prefix: "xvfb"
49-
format:
50-
- zip
51-
- setup
52-
- msi
53-
- dmg
54-
- deb
55-
- tar
56-
- rpm
57-
hadron-distribution:
58-
- compass
52+
53+
# Windows
54+
# - package: windows_zip
55+
# runs-on: windows-latest
56+
# arch: x64
57+
# hadron-platform: windows
58+
# - package: windows_msi
59+
# runs-on: windows-latest
60+
# arch: x64
61+
# hadron-platform: windows
62+
# - package: windows_setup
63+
# runs-on: windows-latest
64+
# arch: x64
65+
# hadron-platform: windows
66+
67+
# Linux
68+
# - package: linux_tar
69+
# runs-on: ubuntu-latest
70+
# arch: x64
71+
# hadron-platform: linux
72+
# - package: linux_deb
73+
# runs-on: ubuntu-latest
74+
# arch: x64
75+
# hadron-platform: linux
76+
# - package: linux_rpm
77+
# runs-on: ubuntu-latest
78+
# arch: x64
79+
# hadron-platform: linux
80+
5981
exclude:
60-
# Excluding formats per platform
61-
- platform:
62-
name: osx
63-
format: setup
64-
- platform:
65-
name: osx
66-
format: msi
67-
- platform:
68-
name: osx
69-
format: deb
70-
- platform:
71-
name: osx
72-
format: tar
73-
- platform:
74-
name: osx
75-
format: rpm
76-
- platform:
77-
name: windows
78-
format: dmg
79-
- platform:
80-
name: windows
81-
format: deb
82-
- platform:
83-
name: windows
84-
format: tar
85-
- platform:
86-
name: windows
87-
format: rpm
88-
- platform:
89-
name: linux
90-
format: setup
91-
- platform:
92-
name: linux
93-
format: msi
94-
- platform:
95-
name: linux
96-
format: dmg
97-
# Temporarily disable running on Windows, Ubuntu
98-
- platform:
99-
name: windows
100-
- platform:
101-
name: linux
102-
runs-on: ${{ matrix.platform.runs-on }}
82+
# Temporarily disable running on Windows and Linux
83+
- package: windows_zip
84+
- package: windows_msi
85+
- package: windows_setup
86+
- package: linux_tar
87+
- package: linux_deb
88+
- package: linux_rpm
89+
runs-on: ${{ matrix.runs-on }}
10390
steps:
10491
- name: Checkout
10592
uses: actions/checkout@v2
@@ -111,10 +98,12 @@ jobs:
11198
- name: Cache downloads
11299
uses: actions/cache@v4
113100
with:
114-
key: smoke-tests-downloads-${{ inputs.version }}-${{ matrix.platform.name }}-${{ matrix.platform.arch }}-${{ matrix.format }}
101+
key: smoke-tests-downloads-${{ inputs.version }}-${{ runner.os }}-${{ runner.arch }}-${{ matrix.package }}
115102
path: packages/compass-smoke-tests/.downloads
116103
- name: Install dependencies and build packages
117-
run: npm run bootstrap-ci
104+
run: npm install
105+
- name: Bootstrap packages
106+
run: npx lerna run bootstrap --scope @mongodb-js/compass-smoke-tests --include-dependencies
118107

119108
- name: Create GitHub App Token
120109
if: matrix.test == 'auto-update-from'
@@ -149,4 +138,4 @@ jobs:
149138
# Exposing token to prevent update server from being rate limited
150139
GITHUB_TOKEN: ${{ github.token }}
151140
working-directory: packages/compass-smoke-tests
152-
run: npm start -- --package ${{ matrix.platform.name }}_${{ matrix.format }} --tests ${{ matrix.test }}
141+
run: npm start -- --package ${{ matrix.package }} --tests ${{ matrix.test }}

0 commit comments

Comments
 (0)