Skip to content

Commit 3760bfb

Browse files
authored
Update macos CI to re-enable launcher test (jython#380)
We opt for Java 11 as that's what the latest runners allow. The test is mainly that the wrapper script works, which is not very sensitive to Java version. Fixes jython#372.
1 parent 281ccfd commit 3760bfb

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/launcher-test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ permissions:
1717

1818
jobs:
1919

20-
launcher-test-macos-jdk8:
20+
launcher-test-macos-jdk11:
2121

22-
runs-on: macos-12 # macos-latest (now >12) no longer installs Java 8
23-
# Options at https://github.com/actions/runner-images
22+
runs-on: macos-latest
23+
# macos-latest (now 14) supports at minimum Java 11
24+
# Options at https://github.com/actions/runner-images
2425

2526
steps:
2627
- run: echo "Branch ${{ github.ref }} of repository ${{ github.repository }}."
@@ -30,10 +31,10 @@ jobs:
3031

3132
- uses: actions/checkout@v4
3233

33-
- name: Set up JDK 8
34+
- name: Set up JDK 11
3435
uses: actions/setup-java@v4
3536
with:
36-
java-version: '8'
37+
java-version: '11'
3738
distribution: 'temurin'
3839

3940
# We have to install Python 2.7 explicitly
@@ -80,3 +81,4 @@ jobs:
8081
- name: Run Java tests with Ant
8182
run: ant javatest-ci
8283

84+

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*.ipr
1616
*.iml
1717
*.iws
18-
.idea/*
18+
.idea/
1919

2020
# Eclipse files
2121
.classpath

0 commit comments

Comments
 (0)