Update Gradle to 7.1.1 and AdoptOpenJDK 16

This commit is contained in:
fgnm
2021-07-15 19:50:18 +02:00
parent 6c7f9a002b
commit 1bc97afa97
10 changed files with 85 additions and 83 deletions
+4 -4
View File
@@ -16,11 +16,11 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Set up JDK 14
uses: actions/setup-java@v1
- name: Set up AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 14
java-version: 16
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
run: ./gradlew build
+3 -3
View File
@@ -15,10 +15,10 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 14
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 14
java-version: 16
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
@@ -34,4 +34,4 @@ jobs:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
run:
./gradlew clean uploadArchives -PRELEASE=true -Psigning.gnupg.keyId=${{ secrets.GPG_KEYID }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Psigning.gnupg.keyName=${{ secrets.GPG_KEYID }}
./gradlew clean build publish -PRELEASE=true -Psigning.gnupg.keyId=${{ secrets.GPG_KEYID }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Psigning.gnupg.keyName=${{ secrets.GPG_KEYID }}
+70 -70
View File
@@ -13,85 +13,85 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 14
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 14
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
run: ./gradlew dist
- name: Build deb package
env:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew jpackage -PSNAPSHOT=true
- name: Fix deb file names
run: mv build/jpackage/*.deb HyperLap2D-SNAPSHOT.deb
- name: Upload deb artifact
uses: actions/upload-artifact@v2
with:
name: HyperLap2D-SNAPSHOT.deb
path: HyperLap2D-SNAPSHOT.deb
- name: Publish SNAPSHOT artifacts
if: "!contains(github.event.head_commit.message, 'editor only')"
env:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
run: ./gradlew uploadArchives -PSNAPSHOT=true
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 16
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
run: ./gradlew dist
- name: Build deb package
env:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew jpackage -PSNAPSHOT=true
- name: Fix deb file names
run: mv build/jpackage/*.deb Linux.HyperLap2D-SNAPSHOT.deb
- name: Upload deb artifact
uses: actions/upload-artifact@v2
with:
name: Linux.HyperLap2D-SNAPSHOT.deb
path: Linux.HyperLap2D-SNAPSHOT.deb
- name: Publish SNAPSHOT artifacts
if: "!contains(github.event.head_commit.message, 'editor only')"
env:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
run: ./gradlew build publish -PSNAPSHOT=true
windows:
if: "!contains(github.event.head_commit.message, 'cd skip')"
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 14
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 14
- name: Build JAR dist files
run: ./gradlew.bat dist
- name: Build msi package
env:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew.bat jpackage -PSNAPSHOT=true
- name: Fix file names
run: mv build/jpackage/*.msi HyperLap2D-SNAPSHOT.msi
- name: Upload msi artifact
uses: actions/upload-artifact@v2
with:
name: HyperLap2D-SNAPSHOT.msi
path: HyperLap2D-SNAPSHOT.msi
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 16
- name: Build JAR dist files
run: ./gradlew.bat dist
- name: Build msi package
env:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew.bat jpackage -PSNAPSHOT=true
- name: Fix file names
run: mv build/jpackage/*.msi Windows.HyperLap2D-SNAPSHOT.msi
- name: Upload msi artifact
uses: actions/upload-artifact@v2
with:
name: Windows.HyperLap2D-SNAPSHOT.msi
path: Windows.HyperLap2D-SNAPSHOT.msi
macOS:
if: "!contains(github.event.head_commit.message, 'cd skip')"
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 14
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 14
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
run: ./gradlew dist
- name: Build dmg package
env:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew jpackage -PSNAPSHOT=true
- name: Fix file names
run: mv build/jpackage/*.dmg HyperLap2D-SNAPSHOT.dmg
- name: Upload dmg artifact
uses: actions/upload-artifact@v2
with:
name: HyperLap2D-SNAPSHOT.dmg
path: HyperLap2D-SNAPSHOT.dmg
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
with:
java-version: 16
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
run: ./gradlew dist
- name: Build dmg package
env:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew jpackage -PSNAPSHOT=true
- name: Fix file names
run: mv build/jpackage/*.dmg macOS.HyperLap2D-SNAPSHOT.dmg
- name: Upload dmg artifact
uses: actions/upload-artifact@v2
with:
name: macOS.HyperLap2D-SNAPSHOT.dmg
path: macOS.HyperLap2D-SNAPSHOT.dmg