mirror of
https://github.com/octoleo/plantuml.git
synced 2025-02-04 13:08:32 +00:00
Merge pull request #904 from soloturn/master
github workflow with various release again
This commit is contained in:
commit
4397977d8a
10
.github/workflows/ci-gradle.yml
vendored
10
.github/workflows/ci-gradle.yml
vendored
@ -71,12 +71,12 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
java_version: [ 11, 17 ]
|
javac_release: [ 8, 11, 17 ]
|
||||||
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
||||||
include:
|
include:
|
||||||
- release_from_this_build: true
|
- release_from_this_build: true
|
||||||
os: ubuntu-20.04
|
os: ubuntu-20.04
|
||||||
java_version: 11
|
javac_release: 8
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
||||||
@ -87,16 +87,16 @@ jobs:
|
|||||||
- name: Set up java
|
- name: Set up java
|
||||||
uses: actions/setup-java@v2.3.1
|
uses: actions/setup-java@v2.3.1
|
||||||
with:
|
with:
|
||||||
java-version: ${{ matrix.java_version }}
|
java-version: 17
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
cache: gradle
|
cache: gradle
|
||||||
|
|
||||||
# Compile / Test / Package are separate steps so the reason for any failure is more obvious in GitHub UI
|
# Compile / Test / Package are separate steps so the reason for any failure is more obvious in GitHub UI
|
||||||
- name: Compile
|
- name: Compile
|
||||||
run: gradle -q compileJava
|
run: gradle -q compileJava -PjavacRelease=${{ matrix.javac_release }}
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: gradle -q test
|
run: gradle -q test -PjavacRelease=${{ matrix.javac_release }}
|
||||||
|
|
||||||
# The repeated "matrix.release_from_this_build" checks are messy, but I have not found a simple way to avoid them
|
# The repeated "matrix.release_from_this_build" checks are messy, but I have not found a simple way to avoid them
|
||||||
# See https://github.com/actions/runner/issues/662
|
# See https://github.com/actions/runner/issues/662
|
||||||
|
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@ -71,12 +71,12 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
java_version: [ 11, 17 ]
|
javac_release: [ 8, 11, 17 ]
|
||||||
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
os: [ macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04, windows-2019, windows-2022 ]
|
||||||
include:
|
include:
|
||||||
- release_from_this_build: true
|
- release_from_this_build: true
|
||||||
os: ubuntu-20.04
|
os: ubuntu-20.04
|
||||||
java_version: 11
|
javac_release: 8
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
SIGN_ARTIFACTS: ${{ secrets.ARTIFACT_SIGNING_KEY != '' }}
|
||||||
@ -87,7 +87,7 @@ jobs:
|
|||||||
- name: Set up java
|
- name: Set up java
|
||||||
uses: actions/setup-java@v2.3.1
|
uses: actions/setup-java@v2.3.1
|
||||||
with:
|
with:
|
||||||
java-version: ${{ matrix.java_version }}
|
java-version: 17
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
cache: maven
|
cache: maven
|
||||||
|
|
||||||
@ -104,10 +104,10 @@ jobs:
|
|||||||
|
|
||||||
# Compile / Test / Package are separate steps so the reason for any failure is more obvious in GitHub UI
|
# Compile / Test / Package are separate steps so the reason for any failure is more obvious in GitHub UI
|
||||||
- name: Compile
|
- name: Compile
|
||||||
run: mvn --batch-mode compile
|
run: mvn --batch-mode compile -Dmaven.compiler.release=${{ matrix.javac_release }}
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: mvn --batch-mode test
|
run: mvn --batch-mode test -Dmaven.compiler.release=${{ matrix.javac_release }}
|
||||||
|
|
||||||
# The repeated "matrix.release_from_this_build" checks are messy, but I have not found a simple way to avoid them
|
# The repeated "matrix.release_from_this_build" checks are messy, but I have not found a simple way to avoid them
|
||||||
# See https://github.com/actions/runner/issues/662
|
# See https://github.com/actions/runner/issues/662
|
||||||
|
Loading…
x
Reference in New Issue
Block a user