Skip to content

Commit 0f20cef

Browse files
committed
Include Microsoft Java distribution in CI matrix
1 parent bd8ff64 commit 0f20cef

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ concurrency:
77

88
env:
99
DEFAULT_JAVA_VERSION: 21
10+
DEFAULT_JAVA_DISTRIBUTION: 'microsoft'
1011

1112
jobs:
1213
build:
13-
name: Build for Java ${{ matrix.java }}
14+
name: Build for Java ${{ matrix.java }} on ${{ matrix.distribution }}
1415
runs-on: ubuntu-latest
1516
strategy:
1617
fail-fast: false
@@ -19,6 +20,11 @@ jobs:
1920
- 21
2021
- 22
2122
- 23
23+
distribution:
24+
- 'adopt-hotspot'
25+
include:
26+
- java: 21
27+
distribution: 'microsoft'
2228
steps:
2329
- name: 'Checkout'
2430
uses: actions/checkout@v4
@@ -29,7 +35,7 @@ jobs:
2935
- name: 'Setup Java'
3036
uses: actions/setup-java@v4
3137
with:
32-
distribution: 'adopt-hotspot'
38+
distribution: ${{ matrix.distribution }}
3339
java-version: ${{ matrix.java }}
3440
- name: 'Setup Gradle'
3541
uses: gradle/actions/setup-gradle@v3
@@ -70,29 +76,29 @@ jobs:
7076
uses: coverallsapp/github-action@v2
7177
- name: 'Deploy as GitHub CI artifacts'
7278
uses: actions/upload-artifact@v4
73-
if: startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
79+
if: startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
7480
with:
7581
if-no-files-found: error
7682
path: build/libs/*
7783
- name: 'Deploy to CurseForge'
78-
if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
84+
if: (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master')) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
7985
env:
8086
CURSEFORGE_KEY_SECRET: ${{ secrets.CURSEFORGE_KEY_SECRET }}
8187
run: ./gradlew publishCurseForge
8288
- name: 'Deploy to Modrinth'
83-
if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
89+
if: (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/master')) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
8490
env:
8591
MODRINTH_KEY_SECRET: ${{ secrets.MODRINTH_KEY_SECRET }}
8692
run: ./gradlew modrinth
8793
- name: 'Deploy to Maven'
88-
if: startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/feature') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION)
94+
if: (startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/feature')) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
8995
env:
9096
MAVEN_URL: ${{ secrets.MAVEN_URL }}
9197
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
9298
MAVEN_KEY: ${{ secrets.MAVEN_KEY }}
9399
run: ./gradlew publish
94100
- name: 'Deploy JavaDoc to GitHub Pages'
95-
if: startsWith(github.ref, 'refs/heads/master')
101+
if: startsWith(github.ref, 'refs/heads/master') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
96102
uses: JamesIves/github-pages-deploy-action@v4
97103
with:
98104
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)