Skip to content

Commit a3ddb93

Browse files
committed
ci: more fiddling - set default shell for windows
I'm not sure what the difference between pwsh and powershell is, but I think we need powershell for official Clojure on Windows?
1 parent e1f319b commit a3ddb93

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

.github/workflows/native-image-test.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,24 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
runs-on: ${{ matrix.os }}
7+
runs-on: ${{ matrix.sys.os }}-latest
88
strategy:
99
fail-fast: false
1010
matrix:
11-
os: [ windows-latest, ubuntu-latest, macos-latest ]
11+
sys:
12+
# override the default of pwsh for windows
13+
- { os: windows, shell: powershell }
14+
- { os: ubuntu, shell: bash }
15+
- { os: macos, shell: bash }
1216
graal-java: [ 11 ]
1317
test: [ test-native, test-native-sci ]
1418
clojure-version: [ '1.11' ]
1519

16-
name: ${{ matrix.os }},jdk ${{ matrix.graal-java }},${{ matrix.test }},clj ${{ matrix.clojure-version }}
20+
defaults:
21+
run:
22+
shell: ${{ matrix.sys.shell }}
23+
24+
name: ${{ matrix.sys.os }},jdk ${{ matrix.graal-java }},${{ matrix.test }},clj ${{ matrix.clojure-version }}
1725

1826
steps:
1927
- uses: actions/checkout@v3

.github/workflows/unit-test.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,30 @@ on: [push, pull_request]
44

55
jobs:
66
build:
7-
runs-on: ${{ matrix.os }}
7+
runs-on: ${{ matrix.sys.os }}-latest
88
strategy:
99
fail-fast: false
1010
matrix:
11-
os: [ windows-latest, ubuntu-latest, macos-latest ]
11+
sys:
12+
# override the default of pwsh for windows
13+
- { os: windows, shell: powershell }
14+
- { os: ubuntu, shell: bash }
15+
- { os: macos, shell: bash }
1216
java: [ '8', '11', '17' ]
1317

14-
name: ${{ matrix.os }},jdk ${{ matrix.java }}
18+
defaults:
19+
run:
20+
shell: ${{ matrix.sys.shell }}
21+
22+
name: ${{ matrix.sys.os }},jdk ${{ matrix.java }}
1523

1624
steps:
1725
#
1826
# Tell git not to convert newlines on checkout for Windows
1927
#
2028
- name: Prepare git (Windows)
2129
run: git config --global core.autocrlf false
22-
if: matrix.os == 'windows-latest'
30+
if: matrix.sys.os == 'windows'
2331

2432
- uses: actions/checkout@v3
2533

@@ -56,16 +64,16 @@ jobs:
5664
#
5765
- name: Install planck (macOS)
5866
run: brew install planck
59-
if: matrix.os == 'macos-latest'
67+
if: matrix.sys.os == 'macos-latest'
6068
- name: Install planck (linux)
6169
run: |
6270
sudo add-apt-repository -y ppa:mfikes/planck
6371
sudo apt-get update
6472
sudo apt-get install -y planck
65-
if: matrix.os == 'ubuntu-latest'
73+
if: matrix.sys.os == 'ubuntu'
6674
- name: Install planck (macOS)
6775
run: brew install planck
68-
if: matrix.os == 'macos-latest'
76+
if: matrix.sys.os == 'macos'
6977

7078
#
7179
# Install Clojure & Babashka
@@ -77,9 +85,6 @@ jobs:
7785
bb: 'latest'
7886
github-token: ${{ secrets.GITHUB_TOKEN }}
7987

80-
- name: Bring down ClojureTools early
81-
run: clojure -Sdescribe
82-
8388
#
8489
# Summarize installs
8590
#
@@ -97,17 +102,17 @@ jobs:
97102
run: |
98103
echo "planck --version"
99104
planck --version
100-
if: matrix.os != 'windows-latest'
105+
if: matrix.sys.os != 'windows'
101106

102107
#
103108
# Node modules
104109
#
105110
- name: Install karma command line (windows)
106111
run: npm install karma-cli -g
107-
if: matrix.os == 'windows-latest'
112+
if: matrix.sys.os == 'windows-latest'
108113
- name: Install karma command line (macos, linux)
109114
run: sudo npm install karma-cli -g
110-
if: matrix.os != 'windows-latest'
115+
if: matrix.sys.os != 'windows-latest'
111116

112117
- name: Install node modules
113118
run: npm install

0 commit comments

Comments
 (0)