Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions .github/actions/prepare-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ inputs:
java-version:
description: 'Java version to use'
required: false
default: '17'
default: '17.0.12'
graal-java-version:
description: 'GraalVM Java version to use for tests (sets GRAALVM_HOME, leaves JAVA_HOME unchanged)'
required: false
default: '21'
push-access:
description: 'Does this workflow require push access?'
required: false
Expand All @@ -22,12 +26,19 @@ inputs:
runs:
using: "composite"
steps:
- name: "🔧 Install GraalVM (JDK${{ inputs.java-version }})"
uses: graalvm/setup-graalvm@main
- name: "🔧 Install Gradle JDK (JDK${{ inputs.java-version }})"
uses: actions/setup-java@v4
with:
distribution: 'graalvm'
java-version: ${{ inputs.java-version }}
- name: "🔧 Install GraalVM for tests (JDK${{ inputs.graal-java-version }})"
if: ${{ inputs.graal-java-version != '' }}
uses: graalvm/setup-graalvm@main
with:
java-version: ${{ inputs.graal-java-version }}
distribution: 'graalvm'
github-token: ${{ inputs.github-token }}
set-java-home: 'false'
- name: "🔒 Configure push access"
if: ${{ inputs.push-access == '1' }}
shell: "bash"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁ Checkout repository"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁ Checkout repository"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-graalvm-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁️ Checkout repository"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-junit-platform-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁️ Checkout repository"
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test-native-gradle-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
uses: ./.github/actions/prepare-environment
with:
java-version: ${{ matrix.java-version }}
graal-java-version: '21'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "❓ Check and test the plugin"
run: ./gradlew :native-gradle-plugin:functionalTest -DgradleVersion="${{ matrix.gradle-version }}" --tests ${{ matrix.test }}
Expand Down Expand Up @@ -103,6 +104,7 @@ jobs:
uses: ./.github/actions/prepare-environment
with:
java-version: ${{ matrix.java-version }}
graal-java-version: '21'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "❓ Check and test the plugin with configuration cache"
run: ./gradlew :native-gradle-plugin:configCacheFunctionalTest -DgradleVersion="${{ matrix.gradle-config-cache-version }}" --tests ${{ matrix.test }}
Expand All @@ -120,7 +122,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁️ Checkout repository"
Expand All @@ -129,6 +131,7 @@ jobs:
uses: ./.github/actions/prepare-environment
with:
java-version: ${{ matrix.java-version }}
graal-java-version: '21'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "❓ Unit tests and inspections"
run: ./gradlew :native-gradle-plugin:test :native-gradle-plugin:inspections
Expand All @@ -146,7 +149,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁️ Checkout repository"
Expand All @@ -155,6 +158,7 @@ jobs:
uses: ./.github/actions/prepare-environment
with:
java-version: ${{ matrix.java-version }}
graal-java-version: ''
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "🔧 Install GraalVM (dev)"
uses: graalvm/setup-graalvm@main
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test-native-maven-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
uses: ./.github/actions/prepare-environment
with:
java-version: ${{ matrix.java-version }}
graal-java-version: '21'
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "❓ Check and test the plugin"
run: ./gradlew :native-maven-plugin:functionalTest --no-daemon --fail-fast --tests ${{ matrix.test }}
Expand All @@ -77,7 +78,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [ 17 ]
java-version: [ 17.0.12 ]
os: [ ubuntu-22.04 ]
steps:
- name: "☁️ Checkout repository"
Expand All @@ -86,6 +87,7 @@ jobs:
uses: ./.github/actions/prepare-environment
with:
java-version: ${{ matrix.java-version }}
graal-java-version: ''
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: "🔧 Install GraalVM (dev)"
uses: graalvm/setup-graalvm@main
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import groovy.json.JsonOutput

def matrixDefault = [
"java-version": [ "17" ],
"java-version": [ "17.0.12" ],
"os": [ "ubuntu-22.04", "windows-latest", "macos-latest" ]
]

Expand Down
6 changes: 6 additions & 0 deletions samples/java-application-with-custom-packaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
Loading