Skip to content

Commit 1554296

Browse files
committed
Merge branch 'fea/pkg-workflows' into fea/pkg-workflows+mount-feature-layers
2 parents 9cc3f54 + 6a1ecfc commit 1554296

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/dev-containers.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ jobs:
4545
4646
cli:
4747
name: CLI
48-
runs-on: ${{ matrix.os }}-latest
48+
runs-on: ${{ matrix.os }}
4949
strategy:
5050
fail-fast: false
5151
matrix:
5252
include:
53-
- { os: ubuntu, pkg: node, os-name: linux, node: 16 }
54-
- { os: ubuntu, pkg: standalone, os-name: linux, node: 16 }
55-
- { os: macos, pkg: standalone, os-name: macos, node: 16 }
56-
- { os: windows, pkg: standalone, os-name: win, node: 16, exe-suf: '.exe' }
53+
- { os: ubuntu-20.04, pkg: node, os-name: linux, node: 16 }
54+
- { os: ubuntu-20.04, pkg: standalone, os-name: linux, node: 16 }
55+
- { os: macos-11, pkg: standalone, os-name: macos, node: 16 }
56+
- { os: windows-2019, pkg: standalone, os-name: win, node: 16, exe-suf: '.exe' }
5757

5858
steps:
5959
- uses: actions/checkout@v3
@@ -83,7 +83,7 @@ jobs:
8383
- name: Cache node_modules
8484
uses: actions/cache@v3
8585
with:
86-
key: ${{ runner.os }}-${{ env.VER }}-node${{ matrix.node }}-node_modules-${{ hashFiles('**/yarn.lock', '**/package.json') }}
86+
key: ${{ matrix.os }}-${{ env.VER }}-node${{ matrix.node }}-node_modules-${{ hashFiles('**/yarn.lock', '**/package.json') }}
8787
path: node_modules
8888
- name: Install Dependencies
8989
shell: bash
@@ -109,11 +109,11 @@ jobs:
109109
name: Test
110110
needs: [changed, cli]
111111
if: needs.changed.outputs.any_changed == 'true' || needs.changed.outputs.any_deleted == 'true'
112-
runs-on: ${{ matrix.os }}-latest
112+
runs-on: ${{ matrix.os }}
113113
strategy:
114114
fail-fast: false
115115
matrix:
116-
os: [ubuntu]
116+
os: [ubuntu-20.04]
117117
pkg: [node]
118118
node: [16]
119119
mocha-args:
@@ -144,10 +144,10 @@ jobs:
144144
--exclude src/test/cli.up.test.ts \
145145
'src/test/**/*.test.ts'"
146146
include:
147-
- { os: ubuntu, pkg: standalone, node: 16, os-name: linux, mocha-args: 'src/test/cli.exec.{buildKit,nonBuildKit}.*.test.ts' }
148-
- { os: ubuntu, pkg: standalone, node: 16, os-name: linux, mocha-args: 'src/test/container-features/{containerFeaturesOCI,generateFeaturesConfig}.test.ts' }
149-
- { os: macos, pkg: standalone, node: 16, os-name: macos, mocha-args: 'src/test/container-features/{containerFeaturesOCI,generateFeaturesConfig}.test.ts' }
150-
- { os: windows, pkg: standalone, node: 16, os-name: win, mocha-args: 'src/test/container-features/{containerFeaturesOCI,generateFeaturesConfig}.test.ts', exe-suf: '.exe' }
147+
- { os: ubuntu-20.04, pkg: standalone, node: 16, os-name: linux, mocha-args: 'src/test/cli.exec.{buildKit,nonBuildKit}.*.test.ts' }
148+
- { os: ubuntu-20.04, pkg: standalone, node: 16, os-name: linux, mocha-args: 'src/test/container-features/{containerFeaturesOCI,generateFeaturesConfig}.test.ts' }
149+
- { os: macos-11, pkg: standalone, node: 16, os-name: macos, mocha-args: 'src/test/container-features/{containerFeaturesOCI,generateFeaturesConfig}.test.ts' }
150+
- { os: windows-2019, pkg: standalone, node: 16, os-name: win, mocha-args: 'src/test/container-features/{containerFeaturesOCI,generateFeaturesConfig}.test.ts', exe-suf: '.exe' }
151151
steps:
152152
- name: Checkout
153153
uses: actions/checkout@v3
@@ -180,7 +180,7 @@ jobs:
180180
- name: Cache node_modules
181181
uses: actions/cache@v3
182182
with:
183-
key: ${{ runner.os }}-${{ env.VER }}-node${{ matrix.node }}-node_modules-${{ hashFiles('**/yarn.lock', '**/package.json') }}
183+
key: ${{ matrix.os }}-${{ env.VER }}-node${{ matrix.node }}-node_modules-${{ hashFiles('**/yarn.lock', '**/package.json') }}
184184
path: node_modules
185185
- name: Install Dependencies
186186
shell: bash
@@ -191,7 +191,7 @@ jobs:
191191
name: ${{ env.ARTIFACT_SLUG }}
192192
path: ${{ env.ARTIFACT_PATH }}
193193
- name: Install docker for macOS
194-
if: matrix.os == 'macos'
194+
if: startsWith(matrix.os, 'macos')
195195
shell: bash
196196
env:
197197
HOMEBREW_ACCEPT_EULA: Y

0 commit comments

Comments
 (0)