From 5698ea087fe4ff0a3396f6bf09853950f396f9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lazar=20Mitrovi=C4=87?= Date: Wed, 10 Aug 2022 00:02:43 +0200 Subject: [PATCH] Fix failing tests CI tweaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lazar Mitrović --- .github/workflows/deploy-documentation.yml | 2 +- .github/workflows/deploy-snapshots.yml | 2 +- .github/workflows/test-graalvm-metadata.yml | 2 +- .github/workflows/test-junit-platform-native.yml | 2 +- .github/workflows/test-native-gradle-plugin.yml | 10 ++++++---- .github/workflows/test-native-maven-plugin.yml | 4 ++-- .../maven/JavaApplicationFunctionalTest.groovy | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-documentation.yml b/.github/workflows/deploy-documentation.yml index 88519ab65..780cf9550 100644 --- a/.github/workflows/deploy-documentation.yml +++ b/.github/workflows/deploy-documentation.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest ] java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: diff --git a/.github/workflows/deploy-snapshots.yml b/.github/workflows/deploy-snapshots.yml index cd460ed8f..196b77f2c 100644 --- a/.github/workflows/deploy-snapshots.yml +++ b/.github/workflows/deploy-snapshots.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest ] java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: diff --git a/.github/workflows/test-graalvm-metadata.yml b/.github/workflows/test-graalvm-metadata.yml index edb52c224..6467fa815 100644 --- a/.github/workflows/test-graalvm-metadata.yml +++ b/.github/workflows/test-graalvm-metadata.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest, dev ] java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: diff --git a/.github/workflows/test-junit-platform-native.yml b/.github/workflows/test-junit-platform-native.yml index 5d561d4bc..65ae36f21 100644 --- a/.github/workflows/test-junit-platform-native.yml +++ b/.github/workflows/test-junit-platform-native.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest, dev ] java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: diff --git a/.github/workflows/test-native-gradle-plugin.yml b/.github/workflows/test-native-gradle-plugin.yml index 2e6ceefdc..e2ddc2116 100644 --- a/.github/workflows/test-native-gradle-plugin.yml +++ b/.github/workflows/test-native-gradle-plugin.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest ] # dev java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: @@ -53,8 +53,10 @@ jobs: strategy: fail-fast: false matrix: - gradle-version: ["current", "7.3.3", "7.2", "7.1", "6.8.3", "6.7.1"] - graalvm-version: [ dev ] + gradle-version: ["current", "6.7.1"] + # Following versions are disabled temporarily in order to speed up PR testing + # "7.3.3", "7.2", "7.1", "6.8.3" + graalvm-version: [ latest ] # dev java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: @@ -81,7 +83,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest ] java-version: [ 11 ] os: [ windows-latest ] steps: diff --git a/.github/workflows/test-native-maven-plugin.yml b/.github/workflows/test-native-maven-plugin.yml index 4d9c96548..afff175c8 100644 --- a/.github/workflows/test-native-maven-plugin.yml +++ b/.github/workflows/test-native-maven-plugin.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest ] # dev java-version: [ 11 ] os: [ ubuntu-20.04 ] steps: @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - graalvm-version: [ dev ] + graalvm-version: [ latest ] # dev java-version: [ 11 ] os: [ windows-latest ] steps: diff --git a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy index 8f08c22b0..caa8b3b7c 100644 --- a/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy +++ b/native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationFunctionalTest.groovy @@ -49,13 +49,13 @@ class JavaApplicationFunctionalTest extends AbstractGraalVMMavenFunctionalTest { when: mvn '-Pnative', '-DskipTests', '-DnativeDryRun', '-DuseArgFile=false', - '-Dclasspath=/testcp', '-Ddebug', '-Dfallback=false', '-Dverbose', '-DsharedLibrary', + '-Dclasspath=/', '-Ddebug', '-Dfallback=false', '-Dverbose', '-DsharedLibrary', '-DquickBuild', 'package' then: buildSucceeded - outputContains "native-image -cp /testcp -g --no-fallback --verbose --shared -Ob" + outputContains "native-image -cp / -g --no-fallback --verbose --shared -Ob" } def "can build and execute a native image with the Maven plugin"() {