From 4d49ce33c2f33002537d12662a5d975d982a5822 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Tue, 26 Apr 2022 03:40:29 -0500
Subject: [PATCH] Changed pipeline to output to special folder.

---
 Jenkinsfile                  | 16 ++++++++--------
 scripts/load_shop_modules.py |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 42aeb6b..f314632 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
     stages {
         stage("cleanup") {
             steps {
-                cleanWs(patterns: [[pattern: '**/bin/Release', type: 'INCLUDE'], [pattern: 'props-linux-x64*', type: 'INCLUDE'], [pattern: 'props-win-x64*', type: 'INCLUDE']])
+                cleanWs(patterns: [[pattern: '**/bin/Release', type: 'INCLUDE'], [pattern: 'output/**', type: 'INCLUDE']])
             }
         }
         stage("Props.Shop") {
@@ -22,8 +22,8 @@ pipeline {
                 }
                 stage("Publish") {
                     steps {
-                        dotnetPublish configuration: 'Release', noRestore: true, project: 'Props.Shop/Props.Shop.sln', selfContained: false, unstableIfWarnings: true
-                        fingerprint 'Props.Shop/**/bin/Release/**/publish/Props.Shop.*'
+                        dotnetPublish configuration: 'Release', outputDirectory: 'output/shop-modules', noRestore: true, project: 'Props.Shop/Props.Shop.sln', selfContained: false, unstableIfWarnings: true
+                        fingerprint 'output/shop-modules/**/Props.Shop.*'
                         sh "python3 scripts/load_shop_modules.py"
                     }
                 }
@@ -39,11 +39,11 @@ pipeline {
                 }
                 stage("Publish") {
                     steps {
-                        dotnetPublish configuration: 'Release', outputDirectory: 'props-linux-x64', project: 'Props', runtime: 'linux-x64', selfContained: true
-                        dotnetPublish configuration: 'Release', outputDirectory: 'props-win-x64', project: 'Props', runtime: 'win-x64', selfContained: true
-                        fingerprint 'Props/bin/Release/**/publish/Props*'
-                        tar file: "props-linux-x64.tar.gz", archive: true, compress: true, dir: "props-linux-x64"
-                        zip zipFile: "props-win-x64.zip", archive: true, dir: "props-win-x64"
+                        dotnetPublish configuration: 'Release', outputDirectory: 'output/props/props-linux-x64', project: 'Props', runtime: 'linux-x64', selfContained: true
+                        dotnetPublish configuration: 'Release', outputDirectory: 'output/props/props-win-x64', project: 'Props', runtime: 'win-x64', selfContained: true
+                        fingerprint 'output/props/**/Props*'
+                        tar file: "output/props-linux-x64.tar.gz", archive: true, compress: true, dir: "props-linux-x64"
+                        zip zipFile: "output/props-win-x64.zip", archive: true, dir: "props-win-x64"
                     }
                 }
             }
diff --git a/scripts/load_shop_modules.py b/scripts/load_shop_modules.py
index dad477b..b28ede1 100644
--- a/scripts/load_shop_modules.py
+++ b/scripts/load_shop_modules.py
@@ -8,7 +8,7 @@ PROP_SHOP_MODULES_DIR = "./Props.Shop/"
 PROPS_SHOP_MODULES_DST = "./Props/shops/."
 NET_VER = "net6.0"
 
-SHOP_MODULE_GLOB = "**/bin/Release/{net_ver}/publish/*.{ext}"
+SHOP_MODULE_GLOB = "output/shop-modules/**/*.{ext}"
 EXTS = ["deps.json", "dll"]