Store downloader in repository root dist directory

mullvad · Feb 27, 2025 · 5aff396 · 5aff396
1 parent e7bfa6c
commit 5aff396
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/downloader.yml b/.github/workflows/downloader.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Check file size
         uses: ./.github/actions/check-file-size
         with:
-          artifact: "./installer-downloader/dist/mullvad-downloader.exe"
+          artifact: "./dist/mullvad-downloader.exe"
           max_size: ${{ env.MAX_BINARY_SIZE }}
 
   build-macos:
@@ -77,5 +77,5 @@ jobs:
       - name: Check file size
         uses: ./.github/actions/check-file-size
         with:
-          artifact: "./installer-downloader/dist/mullvad-downloader.dmg"
+          artifact: "./dist/mullvad-downloader.dmg"
           max_size: ${{ env.MAX_BINARY_SIZE }}
diff --git a/installer-downloader/build.sh b/installer-downloader/build.sh
@@ -30,7 +30,7 @@ export CARGO_TARGET_DIR
 # Temporary build directory
 BUILD_DIR="./build"
 # Successfully built (and signed) artifacts
-DIST_DIR="./dist"
+DIST_DIR="../dist"
 
 BUNDLE_NAME="MullvadDownloader"
 BUNDLE_ID="net.mullvad.$BUNDLE_NAME"
@@ -236,6 +236,8 @@ function dist_macos_app {
 
     # Move to dist dir
     log_info "Moving final artifacts to $DIST_DIR"
+    rm -rf "$DIST_DIR/$FILENAME.app/"
+    rm -rf "$DIST_DIR/$FILENAME.dmg"
     mv "$app_path" "$DIST_DIR/"
     mv "$dmg_path" "$DIST_DIR/"
 }