diff --git a/.cirrus.yml b/.cirrus.yml index 03d5ffa3a..c4e7ae68d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,10 +5,11 @@ env: Build_task: container: image: node:18-slim - cpu: 4 - memory: 4gb + Enable_Corepack_script: + - corepack enable Yarn_cache: folder: .yarn/cache + reupload_on_changes: true Yarn_Populate_script: - yarn Install_System_Dependencies_script: @@ -26,8 +27,8 @@ Build_task: - cp node-$(cat .nvmrc)-win-x64/LICENSE nodedist/LICENSE Assemble_Full_script: - ./packaging/ciAssemble.sh - Assemble_Lite_script: - - ./packaging/ciAssemble.sh lite + Assemble_Linux_script: + - ./packaging/ciAssemble.sh linux Peacock_Release_artifacts: path: Peacock-v*.zip type: application/zip @@ -37,8 +38,11 @@ Build_task: task: container: image: node:18-slim + Enable_Corepack_script: + - corepack enable Yarn_cache: folder: .yarn/cache + reupload_on_changes: true Yarn_Populate_script: - yarn Type_Check_script: diff --git a/packaging/ciAssemble.sh b/packaging/ciAssemble.sh index 758758c5f..471031f60 100755 --- a/packaging/ciAssemble.sh +++ b/packaging/ciAssemble.sh @@ -20,19 +20,19 @@ VERSION=$(jq -r '.version' package.json) if [ "$1" == "" ]; then echo "Assembling $VERSION with default settings" - IS_LITE=false + IS_LINUX=false OUT_DIR=Peacock-v"$VERSION" else - echo "Assembling $VERSION with lite configuration" - IS_LITE=true - OUT_DIR=Peacock-v"$VERSION"-lite + echo "Assembling $VERSION with Linux configuration" + IS_LINUX=true + OUT_DIR=Peacock-v"$VERSION"-linux fi mkdir "$OUT_DIR" cp packaging/HOW_TO_USE.html "$OUT_DIR" cp PeacockPatcher.exe "$OUT_DIR" cp chunk*.js "$OUT_DIR" -if [ "$IS_LITE" != true ]; then +if [ "$IS_LINUX" != true ]; then cp -r nodedist "$OUT_DIR" cp "packaging/Start Server.cmd" "$OUT_DIR" cp "packaging/Tools.cmd" "$OUT_DIR"