diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 056efc6ea..fef6cf018 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -158,7 +158,6 @@ jobs: pnpm i pnpm exec electron-builder --${{ matrix.platform }} \ ${{ matrix.platform == 'macos' && '--universal' || '' }} \ - ${{ matrix.platform == 'windows' && '-c.win.target=zip' || '' }} \ --publish never - name: Collect and Rename Artifacts shell: bash @@ -169,7 +168,7 @@ jobs: if [ "${{ matrix.platform }}" == "windows" ]; then [[ "${{ matrix.os }}" == *"arm"* ]] && SUFFIX="win-aarch64" || SUFFIX="win64" - cp "$SRC_DIR"/win/*.exe "$DEST_DIR/SlimeVR-$SUFFIX.zip" + cp "$SRC_DIR"/win/*.zip "$DEST_DIR/SlimeVR-$SUFFIX.zip" elif [ "${{ matrix.platform }}" == "linux" ]; then for f in "$SRC_DIR"/linux/*; do @@ -233,7 +232,7 @@ jobs: create-release: name: Finalize Release Draft needs: [package-desktop, bundle-android, build-server-jar, build-gui-frontend] - if: startsWith(github.ref, 'refs/tags/') + # if: startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest steps: - name: Download All Release Artifacts @@ -254,6 +253,7 @@ jobs: uses: softprops/action-gh-release@v2 with: draft: true + tag_name: electron_test generate_release_notes: true files: | release-out/* diff --git a/flake.nix b/flake.nix index ca7ccdf1e..272217281 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ xorg.libxshmfence libusb1 udev libxcrypt-legacy rpm fpm - wine + wineWow64Packages.stable zlib squashfsTools fakeroot libarchive icu nodejs_22 pnpm pkg-config python3 gcc gnumake binutils git pkgs.nodePackages.node-gyp-build diff --git a/gui/electron-builder.yml b/gui/electron-builder.yml index 4be412bd0..766f42612 100644 --- a/gui/electron-builder.yml +++ b/gui/electron-builder.yml @@ -51,8 +51,11 @@ rpm: win: artifactName: "${productName}-${os}-${arch}.${ext}" - target: [target: portable] + target: zip icon: "./electron/resources/icons/icon.ico" + extraFiles: + - from: "../server/desktop/build/libs/slimevr.jar" + to: "." mac: target: dmg