Skip to content

Commit 753a1ce

Browse files
committed
skip toolchain test
1 parent 27b0ae2 commit 753a1ce

File tree

2 files changed

+33
-36
lines changed

2 files changed

+33
-36
lines changed

build.gradle

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
id 'com.github.jk1.dependency-license-report' version '2.1'
2424
id "com.github.hierynomus.license" version "0.16.1"
2525
id 'org.asciidoctor.jvm.convert' version '3.3.2'
26-
id "org.ajoberstar.git-publish" version "3.0.0"
26+
id "org.ajoberstar.git-publish" version "4.1.1"
2727
}
2828

2929
if(JavaVersion.current() != JavaVersion.VERSION_11) {
@@ -178,40 +178,37 @@ gitPublish {
178178
repoUri = 'https://github.com/beryx/badass-jlink-plugin.git'
179179
branch = 'gh-pages'
180180

181-
contents {
182-
def pgType = project.hasProperty('ghPageType') ? ghPageType : 'latest'
183-
if(pgType == 'init') {
184-
from file("ghpages")
185-
} else if(pgType == 'list') {
186-
from file("build/release-list")
187-
} else {
188-
from file("${asciidoctor.outputDir.path}/html5")
189-
from file("build/docs")
190-
}
191-
def docDir = Boolean.valueOf(badassJlinkPluginReleaseBuild) ? 'releases' : 'snapshots'
192-
if(pgType == 'init') {
193-
into "."
194-
} else if(pgType == 'list') {
195-
into "."
196-
preserve {
197-
include '**'
198-
exclude "releases.md"
199-
}
200-
} else if(pgType == 'version') {
201-
gitPublishPush.enabled = (docDir != 'snapshots')
202-
into "$docDir/$badassJlinkPluginVersion"
203-
204-
preserve {
205-
include '**'
206-
exclude "$docDir/$badassJlinkPluginVersion"
207-
}
208-
} else {
209-
into "$docDir/latest"
181+
def pgType = project.hasProperty('ghPageType') ? ghPageType : 'latest'
182+
if(pgType == 'init') {
183+
contents .from file("ghpages")
184+
} else if(pgType == 'list') {
185+
contents.from file("build/release-list")
186+
} else {
187+
contents.from file("${asciidoctor.outputDir.path}/html5")
188+
contents.from file("build/docs")
189+
}
210190

211-
preserve {
212-
include '**'
213-
exclude "$docDir/latest"
214-
}
191+
def docDir = Boolean.valueOf(badassJlinkPluginReleaseBuild) ? 'releases' : 'snapshots'
192+
if(pgType == 'init') {
193+
contents.into "."
194+
} else if(pgType == 'list') {
195+
contents.into "."
196+
preserve {
197+
include '**'
198+
exclude "releases.md"
199+
}
200+
} else if(pgType == 'version') {
201+
gitPublishPush.enabled = (docDir != 'snapshots')
202+
contents.into "$docDir/$badassJlinkPluginVersion"
203+
preserve {
204+
include '**'
205+
exclude "$docDir/$badassJlinkPluginVersion"
206+
}
207+
} else {
208+
contents.into "$docDir/latest"
209+
preserve {
210+
include '**'
211+
exclude "$docDir/latest"
215212
}
216213
}
217214
}

src/test/groovy/org/beryx/jlink/JlinkPluginSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.beryx.jlink
1818
import org.gradle.testkit.runner.BuildResult
1919
import org.gradle.testkit.runner.GradleRunner
2020
import org.gradle.testkit.runner.TaskOutcome
21-
import spock.lang.IgnoreIf
21+
import spock.lang.Ignore
2222
import spock.lang.Specification
2323
import spock.lang.TempDir
2424
import spock.lang.Unroll
@@ -82,7 +82,7 @@ class JlinkPluginSpec extends Specification {
8282
checkOutput(result, 'modular-hello', 'LOG: Hello, modular Java!')
8383
}
8484

85-
@IgnoreIf({ os.windows })
85+
@Ignore("Gradle bug: https://github.com/gradle/native-platform/issues/274")
8686
def "should use configured toolchain"() {
8787
when:
8888
setUpBuild('hello-toolchain')

0 commit comments

Comments
 (0)