From 00511823380898d4ef7a0a8fc2246e4dd6df6ec2 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Mon, 21 Apr 2025 12:54:46 +0100 Subject: [PATCH] ci: Windows installer is now deployed directly to artifacts directory --- .ci/pack.sh | 7 +------ .github/workflows/build.yml | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.ci/pack.sh b/.ci/pack.sh index caa4a7feb..30a2d9546 100755 --- a/.ci/pack.sh +++ b/.ci/pack.sh @@ -14,7 +14,7 @@ else fi # Archive and upload the artifacts. -mkdir artifacts +mkdir -p artifacts function pack_artifacts() { ARTIFACTS_PATH="$1" @@ -50,11 +50,6 @@ function pack_artifacts() { rm -rf "$REV_NAME" } -if [ "$OS" = "windows" ] && [ "$GITHUB_REF_TYPE" = "tag" ]; then - # Move the installer to the artifacts directory - mv src/installer/bin/*.exe artifacts/ -fi - if [ -n "$UNPACKED" ]; then # Copy the artifacts to be uploaded unpacked. for ARTIFACT in build/bundle/*; do diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d921871f..c11acb71c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,8 +188,8 @@ jobs: run: | cd src\installer "C:\Program Files (x86)\NSIS\makensis.exe" /DPRODUCT_VARIANT=${{ matrix.target }} /DPRODUCT_VERSION=${{ github.ref_name }} citra.nsi - mkdir bin - move /y *.exe bin\ + mkdir ..\..\artifacts 2> NUL + move /y *.exe ..\..\artifacts\ shell: cmd - name: Pack run: ./.ci/pack.sh