Skip to content

Commit 71c0e19

Browse files
TalankTalank
committed
Force all-OS matrix for all workflows
1 parent 61eabd6 commit 71c0e19

1 file changed

Lines changed: 74 additions & 77 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 74 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -15,62 +15,59 @@
1515
name: CI
1616

1717
on:
18-
push:
19-
branches:
20-
- master
21-
pull_request:
22-
branches:
23-
- master
24-
18+
- push
2519
jobs:
2620
test-OpenJDK:
2721
name: "JDK ${{ matrix.java }} on ${{ matrix.os }}"
2822
strategy:
2923
fail-fast: false
3024
matrix:
31-
os: [ubuntu-latest]
25+
os:
26+
- ubuntu-latest
27+
- macos-latest
28+
- windows-latest
3229
java: [21, 17]
3330
experimental: [false]
3431
include:
3532
# Only test on MacOS and Windows with a single recent JDK to avoid a
3633
# combinatorial explosion of test configurations.
37-
- os: macos-latest
38-
java: 21
39-
experimental: false
40-
- os: windows-latest
41-
java: 21
42-
experimental: false
43-
- os: ubuntu-latest
44-
java: EA
45-
experimental: true
34+
- os: macos-latest
35+
java: 21
36+
experimental: false
37+
- os: windows-latest
38+
java: 21
39+
experimental: false
40+
- os: ubuntu-latest
41+
java: EA
42+
experimental: true
4643
runs-on: ${{ matrix.os }}
4744
continue-on-error: ${{ matrix.experimental }}
4845
steps:
49-
- name: Cancel previous
50-
uses: styfle/cancel-workflow-action@0.9.1
51-
with:
52-
access_token: ${{ github.token }}
53-
- name: "Check out repository"
54-
uses: actions/checkout@v4
55-
- name: "Set up JDK ${{ matrix.java }} from jdk.java.net"
56-
if: ${{ matrix.java == 'EA' }}
57-
uses: oracle-actions/setup-java@v1
58-
with:
59-
website: jdk.java.net
60-
release: ${{ matrix.java }}
61-
- name: "Set up JDK ${{ matrix.java }} from Zulu"
62-
if: ${{ matrix.java != 'EA' && matrix.java != 'GraalVM' }}
63-
uses: actions/setup-java@v4
64-
with:
65-
java-version: ${{ matrix.java }}
66-
distribution: "zulu"
67-
cache: "maven"
68-
- name: "Install"
69-
shell: bash
70-
run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
71-
- name: "Test"
72-
shell: bash
73-
run: mvn test -B
46+
- name: Cancel previous
47+
uses: styfle/cancel-workflow-action@0.9.1
48+
with:
49+
access_token: ${{ github.token }}
50+
- name: "Check out repository"
51+
uses: actions/checkout@v4
52+
- name: "Set up JDK ${{ matrix.java }} from jdk.java.net"
53+
if: ${{ matrix.java == 'EA' }}
54+
uses: oracle-actions/setup-java@v1
55+
with:
56+
website: jdk.java.net
57+
release: ${{ matrix.java }}
58+
- name: "Set up JDK ${{ matrix.java }} from Zulu"
59+
if: ${{ matrix.java != 'EA' && matrix.java != 'GraalVM' }}
60+
uses: actions/setup-java@v4
61+
with:
62+
java-version: ${{ matrix.java }}
63+
distribution: "zulu"
64+
cache: "maven"
65+
- name: "Install"
66+
shell: bash
67+
run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
68+
- name: "Test"
69+
shell: bash
70+
run: mvn test -B
7471

7572
test-GraalVM:
7673
name: "GraalVM on ${{ matrix.os }}"
@@ -84,47 +81,47 @@ jobs:
8481
runs-on: ${{ matrix.os }}
8582
continue-on-error: true
8683
steps:
87-
- name: Cancel previous
88-
uses: styfle/cancel-workflow-action@0.9.1
89-
with:
90-
access_token: ${{ github.token }}
91-
- name: "Check out repository"
92-
uses: actions/checkout@v4
93-
- name: "Set up GraalVM ${{ matrix.java }}"
94-
uses: graalvm/setup-graalvm@v1
95-
with:
96-
java-version: "21"
97-
distribution: "graalvm-community"
98-
github-token: ${{ secrets.GITHUB_TOKEN }}
99-
native-image-job-reports: "true"
100-
cache: "maven"
101-
- name: "Native Build"
102-
run: mvn -Pnative -DskipTests package -pl core -am
103-
- name: "Native Test"
84+
- name: Cancel previous
85+
uses: styfle/cancel-workflow-action@0.9.1
86+
with:
87+
access_token: ${{ github.token }}
88+
- name: "Check out repository"
89+
uses: actions/checkout@v4
90+
- name: "Set up GraalVM ${{ matrix.java }}"
91+
uses: graalvm/setup-graalvm@v1
92+
with:
93+
java-version: "21"
94+
distribution: "graalvm-community"
95+
github-token: ${{ secrets.GITHUB_TOKEN }}
96+
native-image-job-reports: "true"
97+
cache: "maven"
98+
- name: "Native Build"
99+
run: mvn -Pnative -DskipTests package -pl core -am
100+
- name: "Native Test"
104101
# Bash script for testing won't work on Windows
105102
# TODO: Anyone reading this wants to write a *.bat or *.ps1 equivalent?
106-
if: ${{ matrix.os != 'windows-latest' }}
107-
run: util/test-native.sh
103+
if: ${{ matrix.os != 'windows-latest' }}
104+
run: util/test-native.sh
108105

109106
publish_snapshot:
110107
name: "Publish snapshot"
111108
needs: test-OpenJDK
112109
if: github.event_name == 'push' && github.repository == 'google/google-java-format' && github.ref == 'refs/heads/master'
113110
runs-on: ubuntu-latest
114111
steps:
115-
- name: "Check out repository"
116-
uses: actions/checkout@v4
117-
- name: "Set up JDK 21"
118-
uses: actions/setup-java@v4
119-
with:
120-
java-version: 21
121-
distribution: "zulu"
122-
cache: "maven"
123-
server-id: sonatype-nexus-snapshots
124-
server-username: CI_DEPLOY_USERNAME
125-
server-password: CI_DEPLOY_PASSWORD
126-
- name: "Publish"
127-
env:
128-
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
129-
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
130-
run: mvn -pl '!eclipse_plugin' source:jar deploy -B -DskipTests=true -Dinvoker.skip=true -Dmaven.javadoc.skip=true
112+
- name: "Check out repository"
113+
uses: actions/checkout@v4
114+
- name: "Set up JDK 21"
115+
uses: actions/setup-java@v4
116+
with:
117+
java-version: 21
118+
distribution: "zulu"
119+
cache: "maven"
120+
server-id: sonatype-nexus-snapshots
121+
server-username: CI_DEPLOY_USERNAME
122+
server-password: CI_DEPLOY_PASSWORD
123+
- name: "Publish"
124+
env:
125+
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
126+
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
127+
run: mvn -pl '!eclipse_plugin' source:jar deploy -B -DskipTests=true -Dinvoker.skip=true -Dmaven.javadoc.skip=true

0 commit comments

Comments
 (0)