From 2acfe0edaabad8fce6a68a6e9800d778a9eec9fe Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 00:32:46 +0100 Subject: [PATCH 01/23] Start of GPG signing --- pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index 38b97c2..a2275a6 100644 --- a/pom.xml +++ b/pom.xml @@ -119,6 +119,21 @@ + + + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + From c6a6d2e8f8fc0e0267c5d860bdff92f33dafaae1 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 00:39:22 +0100 Subject: [PATCH 02/23] WIP jenkinsfile. --- Jenkinsfile | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..41a6027 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,48 @@ +pipeline { + agent none + stages { + stage('Build') { + parallel { + stage('Build on Windows') { + agent { + label "windows" + } + steps { + bat 'mvn -B -DskipTests clean package' + } + post { + always { + archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + } + } + } + stage('Build on Windows') { + agent { + label "linux" + } + steps { + sh 'mvn -B -DskipTests clean package' + } + post { + always { + archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + } + } + } + stage('Build on OSX') { + agent { + label "osx" + } + steps { + sh 'mvn -B -DskipTests clean package' + } + post { + always { + archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + } + } + } + } + } + } +} \ No newline at end of file From 49946e27e0abdfc291a87a87ee82d978ab1a4484 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 00:50:27 +0100 Subject: [PATCH 03/23] WIP jenkinsfile. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 41a6027..1f776bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { } } } - stage('Build on Windows') { + stage('Build on Linux') { agent { label "linux" } From 62451c9cb7c52f45e40d0d6b8671e7f988d40462 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 00:58:17 +0100 Subject: [PATCH 04/23] Trigger builds once a branch is discovered. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1f776bd..770c3bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,6 @@ pipeline { agent none + triggers { pollSCM('H/15 * * * *') } stages { stage('Build') { parallel { From 4c7eff906eb1dbc14941bf43cbfa12f24af779ed Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 01:00:46 +0100 Subject: [PATCH 05/23] Add the tools. --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 770c3bc..8e5d4f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,10 @@ pipeline { agent none triggers { pollSCM('H/15 * * * *') } + tools { + maven 'apache-maven-3.0.1' + jdk 'OpenJDK 9' + } stages { stage('Build') { parallel { From cc2c6639167d3106aa0e4512d95c6be7210e56ed Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 01:02:13 +0100 Subject: [PATCH 06/23] Add the tools. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e5d4f9..a28fb00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent none triggers { pollSCM('H/15 * * * *') } tools { - maven 'apache-maven-3.0.1' + maven 'Maven 3.5.3' jdk 'OpenJDK 9' } stages { From 69d6b1b8a66018f0c029e8ad917ff769eff56055 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 01:16:53 +0100 Subject: [PATCH 07/23] Add the tools. --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index a28fb00..df72e26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,7 @@ pipeline { label "windows" } steps { + bat 'echo %JAVA_HOME%' bat 'mvn -B -DskipTests clean package' } post { @@ -26,6 +27,7 @@ pipeline { label "linux" } steps { + sh 'echo $JAVA_HOME' sh 'mvn -B -DskipTests clean package' } post { @@ -39,6 +41,7 @@ pipeline { label "osx" } steps { + sh 'echo $JAVA_HOME' sh 'mvn -B -DskipTests clean package' } post { From 517357401e1b291719d4d88a73390fadd53387ad Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 01:29:14 +0100 Subject: [PATCH 08/23] Only keep 5 builds. --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index df72e26..dd0a411 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,7 @@ pipeline { maven 'Maven 3.5.3' jdk 'OpenJDK 9' } + options { buildDiscarder(logRotator(numToKeepStr: '5')) } stages { stage('Build') { parallel { From 9d11cb04da440bd8a9a58cd579d6c1c59d17bc16 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 01:39:46 +0100 Subject: [PATCH 09/23] Unstash artifacts --- Jenkinsfile | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dd0a411..4420b46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,8 +18,8 @@ pipeline { bat 'mvn -B -DskipTests clean package' } post { - always { - archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + success { + stash includes: '**/target/*.jar*', name: 'windows-artifacts' } } } @@ -32,8 +32,8 @@ pipeline { sh 'mvn -B -DskipTests clean package' } post { - always { - archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + success { + stash includes: '**/target/*.jar*', name: 'linux-artifacts' } } } @@ -46,12 +46,27 @@ pipeline { sh 'mvn -B -DskipTests clean package' } post { - always { - archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + success { + stash includes: '**/target/*.jar*', name: 'osx-artifacts' } } } } } + stage('Unpack') { + agent { + label "linux" + } + steps { + unstash 'windows-artifacts' + unstash 'osx-artifacts' + unstash 'linux-artifacts' + } + post { + always { + archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true + } + } + } } } \ No newline at end of file From 04b2dce53a3af82f1851ed86493fef31b11ed108 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 17:19:47 +0100 Subject: [PATCH 10/23] Reduce the items we are stashing and unstashing. --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4420b46..fb3d9a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { } post { success { - stash includes: '**/target/*.jar*', name: 'windows-artifacts' + stash includes: 'plugins/**/target/*.jar*', name: 'windows-artifacts' } } } @@ -33,7 +33,7 @@ pipeline { } post { success { - stash includes: '**/target/*.jar*', name: 'linux-artifacts' + stash includes: 'plugins/**/target/*.jar*', name: 'linux-artifacts' } } } @@ -47,7 +47,7 @@ pipeline { } post { success { - stash includes: '**/target/*.jar*', name: 'osx-artifacts' + stash includes: 'plugins/**/target/*.jar*', name: 'linux-artifacts' } } } @@ -60,7 +60,6 @@ pipeline { steps { unstash 'windows-artifacts' unstash 'osx-artifacts' - unstash 'linux-artifacts' } post { always { From f541fdb219075ed02018ecdceea90876b729bfac Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 17:29:25 +0100 Subject: [PATCH 11/23] Fix the stashing and unstashing --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb3d9a8..33f422c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,11 +31,6 @@ pipeline { sh 'echo $JAVA_HOME' sh 'mvn -B -DskipTests clean package' } - post { - success { - stash includes: 'plugins/**/target/*.jar*', name: 'linux-artifacts' - } - } } stage('Build on OSX') { agent { @@ -47,7 +42,7 @@ pipeline { } post { success { - stash includes: 'plugins/**/target/*.jar*', name: 'linux-artifacts' + stash includes: 'plugins/**/target/*.jar*', name: 'osx-artifacts' } } } From 5b0cafeb3622c5b9873023f5aef23a99cfb41f80 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 17:49:04 +0100 Subject: [PATCH 12/23] Fix the stashing and unstashing --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 33f422c..eb760ca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,12 @@ pipeline { sh 'echo $JAVA_HOME' sh 'mvn -B -DskipTests clean package' } + post { + success { + stash includes: 'plugins/**/target/*.jar*', name: 'linux-artifacts' + stash includes: '**/target/*.jar*', excludes: 'plugins/**/target/*.jar*', name: 'core-artifacts' + } + } } stage('Build on OSX') { agent { @@ -53,8 +59,10 @@ pipeline { label "linux" } steps { + unstash 'core-artifacts' unstash 'windows-artifacts' unstash 'osx-artifacts' + unstash 'linux-artifacts' } post { always { From 4731a08964a711fed891eb427d45c3b96d700223 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 20:12:22 +0100 Subject: [PATCH 13/23] First attempt at deploying snapshots to maven central --- Jenkinsfile | 24 ++++++++++++++++++++---- pom.xml | 52 ++++++++++++++++++++++------------------------------ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb760ca..1d7d95a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -54,10 +54,8 @@ pipeline { } } } - stage('Unpack') { - agent { - label "linux" - } + stage('Archive artifacts') { + agent any steps { unstash 'core-artifacts' unstash 'windows-artifacts' @@ -70,5 +68,23 @@ pipeline { } } } + stage('Deploy artifacts') { + agent { + label "linux" + } + steps { + unstash 'core-artifacts' + unstash 'windows-artifacts' + unstash 'osx-artifacts' + unstash 'linux-artifacts' + sh 'echo $GPG_SECRET_KEYS | base64 --decode | gpg --import' + sh 'echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust' + withMaven( + mavenSettingsConfig: 'maven-central' + ) { + sh "mvn deploy" + } + } + } } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index a2275a6..b4fb428 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,17 @@ scm:git:https://github.com/jinput/jinput.git + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + UTF-8 1.6 @@ -133,36 +144,17 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.1 - - - sign-artifacts - verify - - sign - - - - - - - - \ No newline at end of file From 6b177835ff495a70ddb32941dde50673cf3c3167 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 20:39:54 +0100 Subject: [PATCH 14/23] Fix secret key importing. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d7d95a..6907a8a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -77,7 +77,7 @@ pipeline { unstash 'windows-artifacts' unstash 'osx-artifacts' unstash 'linux-artifacts' - sh 'echo $GPG_SECRET_KEYS | base64 --decode | gpg --import' + sh 'echo $GPG_SECRET_KEYS | base64 --decode | gpg --batch --import' sh 'echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust' withMaven( mavenSettingsConfig: 'maven-central' From 5d19200671dc8f576a7b1498bd2f633d1b9d25c2 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 21:00:23 +0100 Subject: [PATCH 15/23] Use ID of settings file. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6907a8a..9ee6eaf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,7 +80,7 @@ pipeline { sh 'echo $GPG_SECRET_KEYS | base64 --decode | gpg --batch --import' sh 'echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust' withMaven( - mavenSettingsConfig: 'maven-central' + mavenSettingsConfig: 'fb36efbf-1df7-4366-80b5-c40c359a2711' ) { sh "mvn deploy" } From 99df8dc84c43245db070e93d4198eaa9b590f4f0 Mon Sep 17 00:00:00 2001 From: Endolf Date: Wed, 23 May 2018 22:00:46 +0100 Subject: [PATCH 16/23] Working towards a working deployment --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9ee6eaf..ecd9290 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,7 +80,9 @@ pipeline { sh 'echo $GPG_SECRET_KEYS | base64 --decode | gpg --batch --import' sh 'echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust' withMaven( - mavenSettingsConfig: 'fb36efbf-1df7-4366-80b5-c40c359a2711' + maven: 'Maven 3.5.3', + jdk: 'OpenJDK 9', + globalMavenSettingsConfig: 'global-maven-settings-ossrh' ) { sh "mvn deploy" } From 70c9291774e42ed8e2e86f48b674833ec493e5ad Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 18:13:44 +0100 Subject: [PATCH 17/23] Add cacerts property for JDK9 missing cacerts file. --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ecd9290..15dc741 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,7 +82,8 @@ pipeline { withMaven( maven: 'Maven 3.5.3', jdk: 'OpenJDK 9', - globalMavenSettingsConfig: 'global-maven-settings-ossrh' + globalMavenSettingsConfig: 'global-maven-settings-ossrh', + mavenOpts: '-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts' //Work around for JDK9 missing cacerts ) { sh "mvn deploy" } From b93ddcc46e9105d4d7f51270ef1a34b994993e67 Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 18:27:46 +0100 Subject: [PATCH 18/23] Lower case the profile names --- plugins/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index e003dc5..9cd4b0a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -17,7 +17,7 @@ - Linux + linux linux @@ -28,7 +28,7 @@ - Windows + windows windows @@ -39,7 +39,7 @@ - OSX + osx mac From 0d466440d90cf33032fc2dde1d7460efe838ebcc Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 18:29:02 +0100 Subject: [PATCH 19/23] Activate all profiles and don't compile the code --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 15dc741..8f68897 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,7 +85,7 @@ pipeline { globalMavenSettingsConfig: 'global-maven-settings-ossrh', mavenOpts: '-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts' //Work around for JDK9 missing cacerts ) { - sh "mvn deploy" + sh "mvn -P linux,windows,osx,wintab deploy:deploy" } } } From 98cf8063253c74d99231eb552a074c057552844b Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 18:58:29 +0100 Subject: [PATCH 20/23] Use the ready built artifacts --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f68897..9a4666a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,7 +85,7 @@ pipeline { globalMavenSettingsConfig: 'global-maven-settings-ossrh', mavenOpts: '-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts' //Work around for JDK9 missing cacerts ) { - sh "mvn -P linux,windows,osx,wintab deploy:deploy" + sh "mvn -P windows,linux,osx,wintab -Dmaven.main.skip -Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskipTests -DskipITs deploy" } } } From d9586e25bbb7aa325fcf0b0b040ff5faa3d3dc8e Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 19:25:57 +0100 Subject: [PATCH 21/23] Refactor the build in to build natives, build and deploy. --- Jenkinsfile | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9a4666a..21f775a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,76 +7,72 @@ pipeline { } options { buildDiscarder(logRotator(numToKeepStr: '5')) } stages { - stage('Build') { + stage('Build natives') { parallel { - stage('Build on Windows') { + stage('Build Windows natives') { agent { label "windows" } steps { - bat 'echo %JAVA_HOME%' - bat 'mvn -B -DskipTests clean package' + bat 'mvn -B -am -pl plugins/windows/,plugins/wintab/ clean compile' } post { success { - stash includes: 'plugins/**/target/*.jar*', name: 'windows-artifacts' + stash includes: 'plugins/**/target/natives/*.dll', name: 'windows-natives' } } } - stage('Build on Linux') { + stage('Build Linux natives') { agent { label "linux" } steps { - sh 'echo $JAVA_HOME' - sh 'mvn -B -DskipTests clean package' + sh 'mvn -B -am -pl plugins/linux/ clean compile' } post { success { - stash includes: 'plugins/**/target/*.jar*', name: 'linux-artifacts' - stash includes: '**/target/*.jar*', excludes: 'plugins/**/target/*.jar*', name: 'core-artifacts' + stash includes: 'plugins/**/target/natives/*.so*', name: 'linux-natives' } } } - stage('Build on OSX') { + stage('Build OSX natives') { agent { label "osx" } steps { - sh 'echo $JAVA_HOME' - sh 'mvn -B -DskipTests clean package' + sh 'mvn -B -am -pl plugins/OSX/ clean compile' } post { success { - stash includes: 'plugins/**/target/*.jar*', name: 'osx-artifacts' + stash includes: '**/target/natives/*.jnilib', name: 'osx-natives' } } } } } - stage('Archive artifacts') { + stage('Build') { agent any steps { - unstash 'core-artifacts' - unstash 'windows-artifacts' - unstash 'osx-artifacts' - unstash 'linux-artifacts' + unstash 'windows-natives' + unstash 'osx-natives' + unstash 'linux-natives' + sh 'mvn -B -P windows,linux,osx,wintab -Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskipTests -DskipITs package' } post { - always { + success { + stash includes: '**/target/*.jar', name: 'all-java-jars' archiveArtifacts artifacts: '**/target/*.jar*', fingerprint: true } } } - stage('Deploy artifacts') { + stage('Deploy') { agent { label "linux" } steps { - unstash 'core-artifacts' - unstash 'windows-artifacts' - unstash 'osx-artifacts' - unstash 'linux-artifacts' + unstash 'windows-natives' + unstash 'osx-natives' + unstash 'linux-natives' sh 'echo $GPG_SECRET_KEYS | base64 --decode | gpg --batch --import' sh 'echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust' withMaven( @@ -85,7 +81,7 @@ pipeline { globalMavenSettingsConfig: 'global-maven-settings-ossrh', mavenOpts: '-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts' //Work around for JDK9 missing cacerts ) { - sh "mvn -P windows,linux,osx,wintab -Dmaven.main.skip -Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskipTests -DskipITs deploy" + sh "mvn -P windows,linux,osx,wintab -Dmaven.antrun.skip -Dmaven.test.skip -DskipTests -DskipITs deploy" } } } From 8a569fdc639b63d54faebd0d1823d4f9d6354cd8 Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 19:28:58 +0100 Subject: [PATCH 22/23] Only run build on linux as windows doesn't like shell scripts.... --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 21f775a..10433d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,9 @@ pipeline { } } stage('Build') { - agent any + agent { + label "linux" + } steps { unstash 'windows-natives' unstash 'osx-natives' From b82395833a7721c122a3db02f93c5093f5444327 Mon Sep 17 00:00:00 2001 From: Endolf Date: Thu, 24 May 2018 19:56:04 +0100 Subject: [PATCH 23/23] Update the example pom to use central snapshots and pull in all plugins --- examples/pom.xml | 156 ++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 103 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 990d916..3ce0cef 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -11,28 +11,65 @@ ../ + + + central-snapshots + https://oss.sonatype.org/content/repositories/snapshots + false + true + + + net.java.jinput coreapi ${project.version} - - + + ${project.groupId} + windows-plugin + ${project.version} + natives-windows + + + ${project.groupId} + osx-plugin + ${project.version} + natives-osx + + + ${project.groupId} + wintab-plugin + ${project.version} + natives-wintab + + + ${project.groupId} + linux-plugin + ${project.version} + natives-linux + + + ${project.groupId} + windows-plugin + ${project.version} + + + ${project.groupId} + osx-plugin + ${project.version} + + + ${project.groupId} + wintab-plugin + ${project.version} + + + ${project.groupId} + linux-plugin + ${project.version} + @@ -51,93 +88,6 @@ - - linux - - - linux - - - - - ${project.groupId} - linux-plugin - ${project.version} - natives-linux - - - ${project.groupId} - linux-plugin - ${project.version} - - - - - osx - - - mac - - - - - ${project.groupId} - osx-plugin - ${project.version} - natives-osx - - - ${project.groupId} - osx-plugin - ${project.version} - - - - - windows - - - windows - - - - - ${project.groupId} - windows-plugin - ${project.version} - natives-windows - - - ${project.groupId} - windows-plugin - ${project.version} - - - - - wintab - - - windows - - - env.WINTABSDKDIR - - - - - ${project.groupId} - wintab-plugin - ${project.version} - natives-wintab - - - ${project.groupId} - wintab-plugin - ${project.version} - - - ReadAllEvents