diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index dfceac2..aeb6d6b 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -80,7 +80,7 @@ jobs: --arch "${{ matrix.goarch }}" \ --outdir dist/desktop - - name: Package Windows EXE + ZIP + - name: Package Windows ZIP if: matrix.artifact == 'windows' shell: bash run: | @@ -108,6 +108,5 @@ jobs: path: | dist/desktop/*.dmg dist/desktop/*.zip - dist/desktop/*.exe dist/desktop/*.deb if-no-files-found: error diff --git a/.github/workflows/release-ship.yml b/.github/workflows/release-ship.yml index 7db884e..ef01e38 100644 --- a/.github/workflows/release-ship.yml +++ b/.github/workflows/release-ship.yml @@ -133,7 +133,6 @@ jobs: artifacts/*.tar.gz artifacts/*.dmg artifacts/*.zip - artifacts/*.exe artifacts/*.deb env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 9480c7f..dc7043d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ WEB_DIR := server-ui web: cd $(WEB_DIR) && npm install && npm run build - @echo "dashboard assets → server/assets" + @echo "dashboard assets -> server/assets" build: cargo build -p orbien-server -p orbien-client @@ -43,18 +43,18 @@ desktop-build: desktop-app desktop-dmg: desktop-build chmod +x scripts/pack-desktop-macos.sh ./scripts/pack-desktop-macos.sh - @echo "app → dist/Orbien Desktop.app" - @echo "dmg → dist/orbien-desktop_*_darwin_*.dmg" + @echo "app -> dist/Orbien Desktop.app" + @echo "dmg -> dist/orbien-desktop_*_darwin_*.dmg" desktop-windows: desktop-build chmod +x scripts/pack-desktop-windows.sh ./scripts/pack-desktop-windows.sh - @echo "exe/zip → dist/orbien-desktop_*_windows_*" + @echo "exe/zip -> dist/orbien-desktop_*_windows_*" desktop-deb: desktop-build chmod +x scripts/pack-desktop-linux-deb.sh ./scripts/pack-desktop-linux-deb.sh - @echo "deb → dist/orbien-desktop_*_linux_*.deb" + @echo "deb -> dist/orbien-desktop_*_linux_*.deb" test: cargo test --workspace diff --git a/Makefile.md b/Makefile.md index 21ce2b8..1f0899b 100644 --- a/Makefile.md +++ b/Makefile.md @@ -15,7 +15,7 @@ Run from the repository root. Build artifacts go to `target/`; packages go to `d | `make desktop-font-subset-full` | Full SC regional fonts (~16 MB) | | `make desktop-build` | Release-build the desktop app | | `make desktop-app` / `make desktop-dmg` | Package macOS `.app` / `.dmg` | -| `make desktop-windows` | Package Windows exe / zip (run on Windows) | +| `make desktop-windows` | Package Windows portable zip (run on Windows) | | `make desktop-deb` | Package Linux `.deb` (run on Debian/Ubuntu) | | `make package` | Run `release`, then copy binaries and `conf/` to `dist/` | | `make test` | Run workspace tests | diff --git a/scripts/pack-desktop-windows.sh b/scripts/pack-desktop-windows.sh index 17ed27b..1ec2596 100755 --- a/scripts/pack-desktop-windows.sh +++ b/scripts/pack-desktop-windows.sh @@ -81,8 +81,6 @@ mkdir -p "$STAGE" EXE_NAME="Orbien-Desktop.exe" cp "$BIN" "${STAGE}/${EXE_NAME}" -STANDALONE="${OUTDIR}/orbien-desktop_${VERSION}_windows_${ARCH_LABEL}.exe" -cp "$BIN" "$STANDALONE" cat > "${STAGE}/README.txt" <