Make GH actions strategy more concise

This commit is contained in:
Daniel Imms
2023-08-19 15:28:44 -07:00
parent 6dae811dae
commit db4567599b
+10 -10
View File
@@ -73,9 +73,9 @@ jobs:
needs: build needs: build
strategy: strategy:
matrix: matrix:
node-version: [16.x, 18.x] node-version: [16, 18]
runs-on: [ubuntu-latest, macos-latest, windows-latest] runs-on: [ubuntu, macos, windows]
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }}-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
@@ -89,10 +89,10 @@ jobs:
run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} run: 7z x compressed-build.zip -aoa -o${{ github.workspace }}
- name: Print directory structure - name: Print directory structure
run: ls -R run: ls -R
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}.x
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}.x
cache: 'yarn' cache: 'yarn'
- name: Install dependencies - name: Install dependencies
run: yarn --frozen-lockfile run: yarn --frozen-lockfile
@@ -103,10 +103,10 @@ jobs:
needs: build needs: build
strategy: strategy:
matrix: matrix:
node-version: [18.x] node-version: [18]
runs-on: [ubuntu-latest, windows-latest] # macos-latest is flaky runs-on: [ubuntu, windows] # macos is flaky
browser: [chromium, firefox] browser: [chromium, firefox]
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }}-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
@@ -120,10 +120,10 @@ jobs:
run: 7z x compressed-build.zip -aoa -o${{ github.workspace }} run: 7z x compressed-build.zip -aoa -o${{ github.workspace }}
- name: Print directory structure - name: Print directory structure
run: ls -R run: ls -R
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}.x
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}.x
cache: 'yarn' cache: 'yarn'
- name: Install dependencies - name: Install dependencies
run: yarn --frozen-lockfile run: yarn --frozen-lockfile