Skip to content

Commit

Permalink
Cherry-pick "lite" -> "linux" from #339
Browse files Browse the repository at this point in the history
Signed-off-by: Reece Dunham <me@rdil.rocks>
  • Loading branch information
RDIL committed Nov 22, 2023
1 parent 5ef79b7 commit 11ceba6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
12 changes: 8 additions & 4 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions packaging/ciAssemble.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 11ceba6

Please sign in to comment.