diff --git a/.gitea/workflows/darwin.yaml b/.gitea/workflows/darwin.yaml index 3801103..89705c4 100644 --- a/.gitea/workflows/darwin.yaml +++ b/.gitea/workflows/darwin.yaml @@ -58,13 +58,13 @@ jobs: run: | chmod +x "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ - -l "$GITHUB_WORKSPACE/dist/builds/darwin/x64/Rosetta-*.dmg" \ + -l "$GITHUB_WORKSPACE/dist/builds/darwin/x64/Rosetta-*.pkg" \ -r "${{ secrets.SSH_TARGET_DIR }}/darwin/x64" \ -s "${{ secrets.SSH_HOST }}" \ -u "${{ secrets.SSH_USERNAME }}" \ -p '${{ secrets.SSH_PASSWORD }}' sh "$GITHUB_WORKSPACE/.gitea/workflows/sshupload.sh" \ - -l "$GITHUB_WORKSPACE/dist/builds/darwin/arm64/Rosetta-*.dmg" \ + -l "$GITHUB_WORKSPACE/dist/builds/darwin/arm64/Rosetta-*.pkg" \ -r "${{ secrets.SSH_TARGET_DIR }}/darwin/arm64" \ -s "${{ secrets.SSH_HOST }}" \ -u "${{ secrets.SSH_USERNAME }}" \ diff --git a/package.json b/package.json index ec06be4..833f9be 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "zip", "pkg" ], - "artifactName": "/builds/darwin/${arch}/Rosetta-${version}.${ext}", + "artifactName": "builds/darwin/${arch}/Rosetta-${version}.${ext}", "publish": null }, "pkg": { @@ -33,8 +33,10 @@ "linux": { "icon": "icons/png/256x256.png", "target": [ - "AppImage" - ] + "AppImage", + "zip" + ], + "artifactName": "builds/linux/${arch}/Rosetta-${version}.${ext}" }, "win": { "icon": "icons/win/icon.ico", @@ -42,7 +44,7 @@ "zip", "nsis" ], - "artifactName": "/builds/win/${arch}/Rosetta-${version}.${ext}" + "artifactName": "builds/win/${arch}/Rosetta-${version}.${ext}" }, "nsis": { "oneClick": false, @@ -64,7 +66,7 @@ "kernel:darwin-arm64": "electron-vite build && electron-builder --mac --arm64", "kernel:darwin-x64": "electron-vite build && electron-builder --mac --x64", "kernel:mac": "npm run kernel:darwin-x64 && npm run kernel:darwin-arm64", - "kernel:linux": "electron-vite build && electron-builder --linux --x64 --arm64" + "kernel:linux": "mkdir -p dist/builds/linux/x86_64 dist/builds/linux/arm64 dist/builds/linux/x64 && electron-vite build && electron-builder --linux --x64 --arm64" }, "dependencies": { "@electron-toolkit/preload": "^3.0.1",