diff --git a/Jenkinsfile b/Jenkinsfile index 6974ac0..5c89e30 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,46 +15,38 @@ pipeline { sh 'npm install --prefix ./Props' } } - stage("Props.Shop") { - stages { - stage("Test") { - steps { - sh returnStatus: true, script: 'conda run -n base dotnet test --logger xunit --no-restore Props.Shop/**/*.Tests.csproj' - xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Shop/*.Tests/TestResults/*.xml', stopProcessingIfError: true)]) - } - } - stage("Publish") { - steps { - sh '''#!/bin/bash - for file in Props.Shop/**/*.csproj - do - conda run -n base dotnet publish --configuration Release --output output/shop-modules $file - done - ''' - fingerprint 'output/shop-modules/**/Props.Shop.*' - sh 'mkdir -p ./Props/shops/' - sh 'cp ./output/shop-modules/*.dll ./output/shop-modules/*.deps.json ./Props/shops/.' - } - } + stage("Test Props.Shop") { + steps { + sh returnStatus: true, script: 'conda run -n base dotnet test --logger xunit --no-restore Props.Shop/**/*.Tests.csproj' + xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Shop/*.Tests/TestResults/*.xml', stopProcessingIfError: true)]) } } - stage("Props") { - stages { - stage("Test") { - steps { - sh returnStatus: true, script: 'conda run -n base dotnet test --logger xunit --no-restore Props.Tests/Props.Tests.csproj' - xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Tests/TestResults/*.xml', stopProcessingIfError: true)]) - } - } - stage("Publish") { - steps { - sh 'conda run -n base dotnet publish --configuration Release --output output/props/props-linux-x64 --runtime linux-x64 --self-contained Props' - sh 'conda run -n base dotnet publish --configuration Release --output output/props/props-win-x64 --runtime win-x64 --self-contained Props' - fingerprint 'output/props/**/Props*' - tar file: "output/props-linux-x64.tar.gz", archive: true, compress: true, dir: "output/props/props-linux-x64" - zip zipFile: "output/props-win-x64.zip", archive: true, dir: "output/props/props-win-x64" - } - } + stage("Publish Props.Shop") { + steps { + sh '''#!/bin/bash + for file in Props.Shop/**/*.csproj + do + conda run -n base dotnet publish --configuration Release --output output/shop-modules $file + done + ''' + fingerprint 'output/shop-modules/**/Props.Shop.*' + sh 'mkdir -p ./Props/shops/' + sh 'cp ./output/shop-modules/*.dll ./output/shop-modules/*.deps.json ./Props/shops/.' + } + } + stage("Test Props") { + steps { + sh returnStatus: true, script: 'conda run -n base dotnet test --logger xunit --no-restore Props.Tests/Props.Tests.csproj' + xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Tests/TestResults/*.xml', stopProcessingIfError: true)]) + } + } + stage("Publish Props") { + steps { + sh 'conda run -n base dotnet publish --configuration Release --output output/props/props-linux-x64 --runtime linux-x64 --self-contained Props' + sh 'conda run -n base dotnet publish --configuration Release --output output/props/props-win-x64 --runtime win-x64 --self-contained Props' + fingerprint 'output/props/**/Props*' + tar file: "output/props-linux-x64.tar.gz", archive: true, compress: true, dir: "output/props/props-linux-x64" + zip zipFile: "output/props-win-x64.zip", archive: true, dir: "output/props/props-win-x64" } } }