Skip to content

Commit abf27ca

Browse files
author
QuadStingray
committed
removed windows tests
1 parent 74dd293 commit abf27ca

File tree

7 files changed

+95
-61
lines changed

7 files changed

+95
-61
lines changed

‎.travis.win.refreshenv.sh

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.travis.yml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,46 @@ before_cache:
2424
- find $HOME/.sbt -name "*.lock" -print -delete
2525
jobs:
2626
include:
27-
- stage: Tests
28-
before_script:
29-
- choco install jdk8
30-
- choco install sbt
31-
- .travis.win.refreshenv.sh
32-
- RefreshEnv
33-
name: "Test on Window with JDK 8"
34-
os: windows
35-
language: bash
36-
script: sbt "^scripted windows/*"
37-
- stage: Tests
38-
before_script:
39-
- choco install jdk8
40-
- choco install sbt
41-
- .travis.win.refreshenv.sh
42-
- RefreshEnv
43-
name: "Test on Window with JDK 8"
44-
os: windows
45-
language: bash
46-
script: sbt "^scripted windows/*"
47-
- stage: Tests
48-
before_script:
49-
- choco install zulu10
50-
- choco install sbt
51-
- .travis.win.refreshenv.sh
52-
- RefreshEnv
53-
name: "Test on Window with Zulu JDK 10"
54-
os: windows
55-
language: bash
56-
script: sbt "^scripted windows/*"
57-
- stage: Tests
58-
before_script:
59-
- choco install openjdk11
60-
- choco install sbt
61-
- .travis.win.refreshenv.sh
62-
- RefreshEnv
63-
name: "Test on Window with OpenJdk JDK 11"
64-
os: windows
65-
language: bash
66-
script: rm -rf $HOME/.ivy2/local; sbt "^scripted windows/*"
27+
# - stage: Tests
28+
# name: "Test on Window with JDK 8"
29+
# before_script:
30+
# - choco install jdk8
31+
# - choco install sbt
32+
# - .travis.win.refreshenv.sh
33+
# - RefreshEnv
34+
# os: windows
35+
# language: bash
36+
# script: sbt "^scripted windows/*"
37+
# - stage: Tests
38+
# name: "Test on Window with JDK 8"
39+
# before_script:
40+
# - choco install jdk8
41+
# - choco install sbt
42+
# - .travis.win.refreshenv.sh
43+
# - RefreshEnv
44+
# os: windows
45+
# language: bash
46+
# script: sbt "^scripted windows/*"
47+
# - stage: Tests
48+
# name: "Test on Window with Zulu JDK 10"
49+
# before_script:
50+
# - choco install zulu10
51+
# - choco install sbt
52+
# - .travis.win.refreshenv.sh
53+
# - RefreshEnv
54+
# os: windows
55+
# language: bash
56+
# script: sbt "^scripted windows/*"
57+
# - stage: Tests
58+
# before_script:
59+
# - choco install openjdk11
60+
# - choco install sbt
61+
# - .travis.win.refreshenv.sh
62+
# - RefreshEnv
63+
# name: "Test on Window with OpenJdk JDK 11"
64+
# os: windows
65+
# language: bash
66+
# script: rm -rf $HOME/.ivy2/local; sbt "^scripted windows/*"
6767
- stage: Tests
6868
name: "Test on Linux with JDK 8"
6969
language: scala

‎src/sbt-test/linux/fileassociation-javafx/build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//#sample-build-sbt
22
import com.quadstingray.sbt.javafx.model.FileAssociation
33

4+
import scala.reflect.io.File
5+
46
name := "file-association-javafx-simple"
57

68
organization := "com.quadstingray"
@@ -24,6 +26,15 @@ javaFxVerbose := true
2426

2527
javaFxNativeBundles := "deb"
2628

29+
TaskKey[Unit]("checkFilePackaged") := {
30+
val bundledFile1 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "%s-%s.deb".format(name.value, version.value)).toString)
31+
val bundledFile2 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "bundles" / "%s-%s.deb".format(name.value, version.value)).toString)
32+
33+
if (!(bundledFile1.exists || bundledFile2.exists))
34+
throw new Exception("Bundled File " + bundledFile1.toString + "or Bundle File" + bundledFile2.toString + " not found!")
35+
36+
()
37+
}
2738

2839
val osName: SettingKey[String] = SettingKey[String]("osName")
2940

‎src/sbt-test/linux/licences-javafx/build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import scala.reflect.io.File
12
//#sample-build-sbt
23
name := "javafx-licences-simple"
34

@@ -21,6 +22,16 @@ javaFxVerbose := true
2122

2223
javaFxNativeBundles := "deb"
2324

25+
TaskKey[Unit]("checkFilePackaged") := {
26+
val bundledFile1 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "%s-%s.deb".format(name.value, version.value)).toString)
27+
val bundledFile2 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "bundles" / "%s-%s.deb".format(name.value, version.value)).toString)
28+
29+
if (!(bundledFile1.exists || bundledFile2.exists))
30+
throw new Exception("Bundled File " + bundledFile1.toString + "or Bundle File" + bundledFile2.toString + " not found!")
31+
32+
()
33+
}
34+
2435
val osName: SettingKey[String] = SettingKey[String]("osName")
2536

2637
osName := (System.getProperty("os.name") match {

‎src/sbt-test/linux/licences-sbt/build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import scala.reflect.io.File
12
//#sample-build-sbt
23
name := "sbt-licences-simple"
34

@@ -21,6 +22,16 @@ javaFxVerbose := true
2122

2223
javaFxNativeBundles := "deb"
2324

25+
TaskKey[Unit]("checkFilePackaged") := {
26+
val bundledFile1 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "%s-%s.deb".format(name.value, version.value)).toString)
27+
val bundledFile2 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "bundles" / "%s-%s.deb".format(name.value, version.value)).toString)
28+
29+
if (!(bundledFile1.exists || bundledFile2.exists))
30+
throw new Exception("Bundled File " + bundledFile1.toString + "or Bundle File" + bundledFile2.toString + " not found!")
31+
32+
()
33+
}
34+
2435
val osName: SettingKey[String] = SettingKey[String]("osName")
2536

2637
osName := (System.getProperty("os.name") match {

‎src/sbt-test/linux/mainclass-javafx/build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import scala.reflect.io.File
12
//#sample-build-sbt
23
name := "sbt-javafx-simple"
34

@@ -19,6 +20,16 @@ javaFxVerbose := true
1920

2021
javaFxNativeBundles := "deb"
2122

23+
TaskKey[Unit]("checkFilePackaged") := {
24+
val bundledFile1 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "%s-%s.deb".format(name.value, version.value)).toString)
25+
val bundledFile2 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "bundles" / "%s-%s.deb".format(name.value, version.value)).toString)
26+
27+
if (!(bundledFile1.exists || bundledFile2.exists))
28+
throw new Exception("Bundled File " + bundledFile1.toString + "or Bundle File" + bundledFile2.toString + " not found!")
29+
30+
()
31+
}
32+
2233
val osName: SettingKey[String] = SettingKey[String]("osName")
2334

2435
osName := (System.getProperty("os.name") match {

‎src/sbt-test/linux/mainclass-sbt/build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import scala.reflect.io.File
12
//#sample-build-sbt
23
name := "sbt-javafx-simple"
34

@@ -21,6 +22,16 @@ javaFxVerbose := true
2122
javaFxNativeBundles := "deb"
2223
//#sample-native-bundles
2324

25+
TaskKey[Unit]("checkFilePackaged") := {
26+
val bundledFile1 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "%s-%s.deb".format(name.value, version.value)).toString)
27+
val bundledFile2 = File((crossTarget.value / "%s_%s-%s".format(name.value, scalaVersion.value, version.value) / "bundles" / "%s-%s.deb".format(name.value, version.value)).toString)
28+
29+
if (!(bundledFile1.exists || bundledFile2.exists))
30+
throw new Exception("Bundled File " + bundledFile1.toString + "or Bundle File" + bundledFile2.toString + " not found!")
31+
32+
()
33+
}
34+
2435
val osName: SettingKey[String] = SettingKey[String]("osName")
2536

2637
osName := (System.getProperty("os.name") match {

0 commit comments

Comments
 (0)