From 61b98ce4e57b406d4742585cdf4de5c947190977 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Sun, 2 Jan 2022 00:06:26 +0100 Subject: [PATCH] Jenkins --- Jenkinsfile | 64 +++++++++++++++++++++++++++++++++++++++++++++++++---- README.md | 6 ++--- build.sh | 6 ++--- 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4a0105d..7cfff57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,9 +66,65 @@ pipeline { sh 'rm -rf build' } } + stage('Build Windows Stageing') { + when { + branch 'stage' + beforeAgent true + } + agent { + docker { + image 'llvm-mingw:latest' + reuseNode true + } + } + steps { + sh 'bash ./build.sh win32' + sh 'bash ./build.sh win64' + } + } + stage('Build Linux Stageing') { + when { + branch 'stage' + beforeAgent true + } + agent { + docker { + image 'llvm:latest' + reuseNode true + } + } + steps { + sh 'bash ./build.sh lin32' + sh 'bash ./build.sh lin64' + } + } + stage('Build MacOSX Stageing') { + when { + branch 'stage' + beforeAgent true + } + agent { + docker { + image 'osxcross:latest' + reuseNode true + } + } + steps { + sh 'bash ./build.sh mac' + } + } + stage('Archive Stageing') { + when { + branch 'stage' + } + steps { + zip zipFile: 'Stage.zip', archive: true, dir: 'build/Plugin' + sh 'rm -rf build' + } + } stage('Build Windows Release') { when { - branch 'prod' + branch 'master' beforeAgent true } agent { @@ -84,7 +140,7 @@ pipeline { } stage('Build Linux Release') { when { - branch 'prod' + branch 'master' beforeAgent true } agent { @@ -100,7 +156,7 @@ pipeline { } stage('Build MacOSX Release') { when { - branch 'prod' + branch 'master' beforeAgent true } agent { @@ -115,7 +171,7 @@ pipeline { } stage('Archive Release') { when { - branch 'prod' + branch 'master' beforeAgent true } steps { diff --git a/README.md b/README.md index 6d4da96..a938b83 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ ### Develop Status -[![Build Status](https://jenkins.hofmannnet.myhome-server.de/job/WebSocketTest/job/develop/badge/icon)](https://jenkins.hofmannnet.myhome-server.de/job/WebSocketTest/job/develop) +[![Build Status](https://jenkins.hofmannnet.myhome-server.de/job/GermanAirlinesVA-GAConnector/job/develop/badge/icon)](https://jenkins.hofmannnet.myhome-server.de/job/GermanAirlinesVA-GAConnector/job/develop) ### Stage Status -[![Build Status](https://jenkins.hofmannnet.myhome-server.de/job/WebSocketTest/job/stage/badge/icon)](https://jenkins.hofmannnet.myhome-server.de/job/WebSocketTest/job/stage) +[![Build Status](https://jenkins.hofmannnet.myhome-server.de/job/GermanAirlinesVA-GAConnector/job/stage/badge/icon)](https://jenkins.hofmannnet.myhome-server.de/job/GermanAirlinesVA-GAConnector/job/stage) ### Prod Status -[![Build Status](https://jenkins.hofmannnet.myhome-server.de/job/WebSocketTest/job/master/badge/icon)](https://jenkins.hofmannnet.myhome-server.de/job/WebSocketTest/job/master) +[![Build Status](https://jenkins.hofmannnet.myhome-server.de/job/GermanAirlinesVA-GAConnector/job/master/badge/icon)](https://jenkins.hofmannnet.myhome-server.de/job/GermanAirlinesVA-GAConnector/job/master) X-Plane Plugin for all supported platforms. Demo of WebSocket capabilities diff --git a/build.sh b/build.sh index eb68bfa..5de6927 100755 --- a/build.sh +++ b/build.sh @@ -2,8 +2,8 @@ mkdir -p build cd build -mkdir -p Plugin/WebSocketTest/32 -mkdir -p Plugin/WebSocketTest/64 +mkdir -p Plugin/GAConnector/32 +mkdir -p Plugin/GAConnector/64 rm -f CMakeCache.txt case $1 in @@ -33,5 +33,5 @@ fi if [ "$1" = "mac" ] && [ "$DEBUG" = "1" ] then - /opt/osxcross/target/bin/osxcross-llvm-dsymutil Plugin/WebSocketTest/mac.xpl + /opt/osxcross/target/bin/osxcross-llvm-dsymutil Plugin/GAConnector/mac.xpl fi