Skip to content

Commit f697aac

Browse files
[ci] Shrink testing matrix
1 parent 531c91e commit f697aac

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,5 @@ workflows:
157157
- test-shellcheck
158158
- test-macos-emacs-latest:
159159
requires:
160-
- test-ubuntu-emacs-28
160+
- test-lint
161+
- test-shellcheck

.github/workflows/test.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,21 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
os: [macos-13, ubuntu-latest, windows-latest]
24+
# Test all Emacs versions on Ubuntu.
25+
os: [ubuntu-latest]
2526
emacs_version: ['26.3', '27.2', '28.2', '29.3', 'snapshot']
26-
java_version: ['11', '17']
27+
java_version: ['21']
2728
include:
28-
# aarch64 (macos-13 is Intel)
29-
- os: macos-latest
29+
# For other OSes, test only the latest stable Emacs version.
30+
- os: macos-latest # aarch64
3031
emacs_version: '29.3'
31-
java_version: '11'
32-
- os: macos-latest
33-
emacs_version: '28.2'
34-
java_version: '11'
35-
- os: macos-latest
32+
java_version: '21'
33+
- os: macos-13 # x64
3634
emacs_version: '29.3'
37-
java_version: '17'
38-
- os: macos-latest
39-
emacs_version: '28.2'
40-
java_version: '17'
35+
java_version: '21'
36+
- os: windows-latest
37+
emacs_version: '29.3'
38+
java_version: '21'
4139

4240
steps:
4341
- name: Set up Emacs
@@ -114,7 +112,7 @@ jobs:
114112
eldev -p -dtTC test --test-type integration || eldev -p -dtTC test --test-type integration
115113
116114
- name: Run tests that need enrich-classpath
117-
if: "!startsWith(matrix.os, 'windows') && (matrix.java_version != '11')"
115+
if: "!startsWith(matrix.os, 'windows')"
118116
run: |
119117
cd dev; ../clojure.sh clojure -M:gen; cd -
120118
wc -l test/File.edn

0 commit comments

Comments
 (0)