Skip to content

Commit 67623f6

Browse files
authored
Fix "Run tests on macOS 10.15 and 11.0"
... and don't log sw_vers as it's already logged by the setup action
1 parent ea8d5f5 commit 67623f6

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ name: Tests and Shellcheck
33
# Trigger the workflow on push or pull request
44
on: [push, pull_request]
55

6+
67

78
jobs:
89

910
tests:
10-
name: Run bash function tests
11-
runs-on: [ macos-10.15, macos-11.0 ]
11+
name: Run bash function tests on ${{ matrix.os }}
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
matrix:
15+
os: [ macos-10.15, macos-11.0 ]
1216

1317
steps:
1418
- uses: actions/checkout@v2
1519

16-
- name: Log Mac OS version information
17-
run: |
18-
sw_vers
19-
2020
# Run the 'java-version-tester' script and show&save (`tee`) the output to a
2121
# logfile; then grep the logfile for 'FAILED' entries which would cause grep
2222
# to exit with 0; then run 'test' command and swap the grep exit code
@@ -30,16 +30,15 @@ jobs:
3030
3131
3232
shellcheck:
33-
name: Check bash syntax with shellcheck
34-
runs-on: macos-latest
33+
name: Check bash syntax with shellcheck on ${{ matrix.os }}
34+
runs-on: ${{ matrix.os }}
35+
strategy:
36+
matrix:
37+
os: [ macos-10.15, macos-11.0 ]
3538

3639
steps:
3740
- uses: actions/checkout@v2
3841

39-
- name: Log Mac OS version information
40-
run: |
41-
sw_vers
42-
4342
- name: Install shellcheck via HomeBrew
4443
run: |
4544
brew install shellcheck

0 commit comments

Comments
 (0)