mirror of
https://git.sanhost.net/sanasol/hytale-f2p
synced 2026-02-27 09:51:47 -03:00
Compare commits
2 Commits
v2.2.2-tes
...
v2.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
39c12c0591 | ||
|
|
094bb938fc |
160
.github/workflows/release.yml
vendored
160
.github/workflows/release.yml
vendored
@@ -27,10 +27,8 @@ jobs:
|
|||||||
dist/*.exe.blockmap
|
dist/*.exe.blockmap
|
||||||
dist/latest.yml
|
dist/latest.yml
|
||||||
|
|
||||||
# macOS ARM64 build (Apple Silicon)
|
build-macos:
|
||||||
build-macos-arm64:
|
runs-on: macos-latest
|
||||||
runs-on: macos-latest # ARM64 runner for native Apple Silicon builds
|
|
||||||
timeout-minutes: 120
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
@@ -39,75 +37,15 @@ jobs:
|
|||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
|
||||||
- name: Build macOS ARM64 Package
|
- name: Build macOS Packages
|
||||||
env:
|
run: npx electron-builder --mac --publish never
|
||||||
# Code signing
|
|
||||||
CSC_LINK: ${{ secrets.CSC_LINK }}
|
|
||||||
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
|
|
||||||
# Notarization
|
|
||||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
|
||||||
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
|
|
||||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
|
||||||
run: npx electron-builder --mac --arm64 --publish never
|
|
||||||
|
|
||||||
- name: Rename ARM64 artifacts for clarity
|
|
||||||
run: |
|
|
||||||
cd dist
|
|
||||||
for f in *.dmg; do
|
|
||||||
[ -f "$f" ] && mv "$f" "${f%.dmg}-arm64.dmg" 2>/dev/null || true
|
|
||||||
done
|
|
||||||
for f in *.zip; do
|
|
||||||
[ -f "$f" ] && mv "$f" "${f%.zip}-arm64.zip" 2>/dev/null || true
|
|
||||||
done
|
|
||||||
ls -la
|
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: macos-arm64-builds
|
name: macos-builds
|
||||||
path: |
|
|
||||||
dist/*.dmg
|
|
||||||
dist/*.zip
|
|
||||||
|
|
||||||
# macOS x64 build (Intel)
|
|
||||||
build-macos-x64:
|
|
||||||
runs-on: macos-15-large # Intel runner for native x64 builds
|
|
||||||
timeout-minutes: 120
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '22'
|
|
||||||
cache: 'npm'
|
|
||||||
- run: npm ci
|
|
||||||
|
|
||||||
- name: Build macOS x64 Package
|
|
||||||
env:
|
|
||||||
# Code signing
|
|
||||||
CSC_LINK: ${{ secrets.CSC_LINK }}
|
|
||||||
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
|
|
||||||
# Notarization
|
|
||||||
APPLE_ID: ${{ secrets.APPLE_ID }}
|
|
||||||
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
|
|
||||||
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
|
|
||||||
run: npx electron-builder --mac --x64 --publish never
|
|
||||||
|
|
||||||
- name: Rename x64 artifacts for clarity
|
|
||||||
run: |
|
|
||||||
cd dist
|
|
||||||
for f in *.dmg; do
|
|
||||||
[ -f "$f" ] && mv "$f" "${f%.dmg}-x64.dmg" 2>/dev/null || true
|
|
||||||
done
|
|
||||||
for f in *.zip; do
|
|
||||||
[ -f "$f" ] && mv "$f" "${f%.zip}-x64.zip" 2>/dev/null || true
|
|
||||||
done
|
|
||||||
ls -la
|
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: macos-x64-builds
|
|
||||||
path: |
|
path: |
|
||||||
dist/*.dmg
|
dist/*.dmg
|
||||||
dist/*.zip
|
dist/*.zip
|
||||||
|
dist/latest-mac.yml
|
||||||
|
|
||||||
build-linux:
|
build-linux:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -188,9 +126,8 @@ jobs:
|
|||||||
.SRCINFO
|
.SRCINFO
|
||||||
include-hidden-files: true
|
include-hidden-files: true
|
||||||
|
|
||||||
# Create release with Windows, Linux, Arch (fast builds)
|
|
||||||
release:
|
release:
|
||||||
needs: [build-windows, build-linux, build-arch]
|
needs: [build-windows, build-macos, build-linux, build-arch]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: |
|
if: |
|
||||||
startsWith(github.ref, 'refs/tags/v') ||
|
startsWith(github.ref, 'refs/tags/v') ||
|
||||||
@@ -204,23 +141,10 @@ jobs:
|
|||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Download Windows artifacts
|
- name: Download all artifacts
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: windows-builds
|
path: artifacts
|
||||||
path: artifacts/windows-builds
|
|
||||||
|
|
||||||
- name: Download Linux artifacts
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: linux-builds
|
|
||||||
path: artifacts/linux-builds
|
|
||||||
|
|
||||||
- name: Download Arch artifacts
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: arch-package
|
|
||||||
path: artifacts/arch-package
|
|
||||||
|
|
||||||
- name: Display structure of downloaded files
|
- name: Display structure of downloaded files
|
||||||
run: ls -R artifacts
|
run: ls -R artifacts
|
||||||
@@ -237,70 +161,10 @@ jobs:
|
|||||||
artifacts/arch-package/*.pkg.tar.zst
|
artifacts/arch-package/*.pkg.tar.zst
|
||||||
artifacts/arch-package/*.src.tar.zst
|
artifacts/arch-package/*.src.tar.zst
|
||||||
artifacts/arch-package/.SRCINFO
|
artifacts/arch-package/.SRCINFO
|
||||||
artifacts/linux-builds/*
|
artifacts/linux-builds/**/*
|
||||||
artifacts/windows-builds/*
|
artifacts/windows-builds/**/*
|
||||||
|
artifacts/macos-builds/**/*
|
||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
draft: true
|
draft: true
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
|
||||||
# Upload macOS ARM64 builds separately
|
|
||||||
release-macos-arm64:
|
|
||||||
needs: [build-macos-arm64, release]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: |
|
|
||||||
startsWith(github.ref, 'refs/tags/v') ||
|
|
||||||
github.ref == 'refs/heads/main' ||
|
|
||||||
github.event_name == 'workflow_dispatch'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Download macOS ARM64 artifacts
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: macos-arm64-builds
|
|
||||||
path: artifacts/macos-arm64-builds
|
|
||||||
|
|
||||||
- name: Display macOS ARM64 files
|
|
||||||
run: ls -R artifacts
|
|
||||||
|
|
||||||
- name: Upload macOS ARM64 to Release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
tag_name: ${{ github.ref_name }}
|
|
||||||
files: |
|
|
||||||
artifacts/macos-arm64-builds/*
|
|
||||||
draft: true
|
|
||||||
prerelease: false
|
|
||||||
|
|
||||||
# Upload macOS x64 builds separately
|
|
||||||
release-macos-x64:
|
|
||||||
needs: [build-macos-x64, release]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: |
|
|
||||||
startsWith(github.ref, 'refs/tags/v') ||
|
|
||||||
github.ref == 'refs/heads/main' ||
|
|
||||||
github.event_name == 'workflow_dispatch'
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Download macOS x64 artifacts
|
|
||||||
uses: actions/download-artifact@v4
|
|
||||||
with:
|
|
||||||
name: macos-x64-builds
|
|
||||||
path: artifacts/macos-x64-builds
|
|
||||||
|
|
||||||
- name: Display macOS x64 files
|
|
||||||
run: ls -R artifacts
|
|
||||||
|
|
||||||
- name: Upload macOS x64 to Release
|
|
||||||
uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
tag_name: ${{ github.ref_name }}
|
|
||||||
files: |
|
|
||||||
artifacts/macos-x64-builds/*
|
|
||||||
draft: true
|
|
||||||
prerelease: false
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>com.apple.security.cs.allow-jit</key>
|
|
||||||
<true/>
|
|
||||||
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
|
||||||
<true/>
|
|
||||||
<key>com.apple.security.cs.disable-library-validation</key>
|
|
||||||
<true/>
|
|
||||||
<key>com.apple.security.network.client</key>
|
|
||||||
<true/>
|
|
||||||
<key>com.apple.security.network.server</key>
|
|
||||||
<true/>
|
|
||||||
<key>com.apple.security.files.user-selected.read-write</key>
|
|
||||||
<true/>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
682
package-lock.json
generated
682
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
67
package.json
67
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hytale-f2p-launcher",
|
"name": "hytale-f2p-launcher",
|
||||||
"version": "2.1.2",
|
"version": "2.2.0",
|
||||||
"description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support",
|
"description": "A modern, cross-platform launcher for Hytale with automatic updates and multi-client support",
|
||||||
"homepage": "https://github.com/amiayweb/Hytale-F2P",
|
"homepage": "https://github.com/amiayweb/Hytale-F2P",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
@@ -25,8 +25,7 @@
|
|||||||
"cross-platform",
|
"cross-platform",
|
||||||
"electron",
|
"electron",
|
||||||
"auto-update",
|
"auto-update",
|
||||||
"mod-manager",
|
"mod-manager"
|
||||||
"chat"
|
|
||||||
],
|
],
|
||||||
"maintainers": [
|
"maintainers": [
|
||||||
{
|
{
|
||||||
@@ -34,7 +33,7 @@
|
|||||||
"url": "https://github.com/Terromur"
|
"url": "https://github.com/Terromur"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Fari Gading",
|
"name": "Fazri Gading",
|
||||||
"email": "fazrigading@gmail.com",
|
"email": "fazrigading@gmail.com",
|
||||||
"url": "https://github.com/fazrigading"
|
"url": "https://github.com/fazrigading"
|
||||||
}
|
}
|
||||||
@@ -45,7 +44,6 @@
|
|||||||
},
|
},
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@electron/notarize": "^2.5.0",
|
|
||||||
"electron": "^40.0.0",
|
"electron": "^40.0.0",
|
||||||
"electron-builder": "^26.4.0"
|
"electron-builder": "^26.4.0"
|
||||||
},
|
},
|
||||||
@@ -56,16 +54,13 @@
|
|||||||
"dotenv": "^17.2.3",
|
"dotenv": "^17.2.3",
|
||||||
"electron-updater": "^6.7.3",
|
"electron-updater": "^6.7.3",
|
||||||
"fs-extra": "^11.3.3",
|
"fs-extra": "^11.3.3",
|
||||||
"tar": "^6.2.1",
|
"tar": "^7.5.7",
|
||||||
"uuid": "^9.0.1"
|
"uuid": "^9.0.1"
|
||||||
},
|
},
|
||||||
"overrides": {
|
|
||||||
"tar": "$tar"
|
|
||||||
},
|
|
||||||
"build": {
|
"build": {
|
||||||
"appId": "com.hytalef2p.launcher",
|
"appId": "com.hytalef2p.launcher",
|
||||||
"productName": "Hytale F2P Launcher",
|
"productName": "Hytale F2P Launcher",
|
||||||
"artifactName": "${name}_${version}_${arch}.${ext}",
|
"artifactName": "${name}_${version}.${ext}",
|
||||||
"directories": {
|
"directories": {
|
||||||
"output": "dist"
|
"output": "dist"
|
||||||
},
|
},
|
||||||
@@ -78,40 +73,14 @@
|
|||||||
".env"
|
".env"
|
||||||
],
|
],
|
||||||
"win": {
|
"win": {
|
||||||
"target": [
|
"target": "nsis",
|
||||||
{
|
|
||||||
"target": "nsis",
|
|
||||||
"arch": [
|
|
||||||
"x64",
|
|
||||||
"arm64"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"icon": "build/icon.ico"
|
"icon": "build/icon.ico"
|
||||||
},
|
},
|
||||||
"linux": {
|
"linux": {
|
||||||
"target": [
|
"target": [
|
||||||
{
|
"AppImage",
|
||||||
"target": "AppImage",
|
"deb",
|
||||||
"arch": [
|
"rpm"
|
||||||
"x64",
|
|
||||||
"arm64"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "deb",
|
|
||||||
"arch": [
|
|
||||||
"x64",
|
|
||||||
"arm64"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "rpm",
|
|
||||||
"arch": [
|
|
||||||
"x64",
|
|
||||||
"arm64"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
"icon": "build/icon.png",
|
"icon": "build/icon.png",
|
||||||
"category": "Game"
|
"category": "Game"
|
||||||
@@ -121,30 +90,20 @@
|
|||||||
{
|
{
|
||||||
"target": "dmg",
|
"target": "dmg",
|
||||||
"arch": [
|
"arch": [
|
||||||
"arm64",
|
"universal"
|
||||||
"x64"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"target": "zip",
|
"target": "zip",
|
||||||
"arch": [
|
"arch": [
|
||||||
"arm64",
|
"universal"
|
||||||
"x64"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "build/icon.icns",
|
"icon": "build/icon.icns",
|
||||||
"category": "public.app-category.games",
|
"artifactName": "${name}_${version}_${arch}.${ext}",
|
||||||
"hardenedRuntime": true,
|
"category": "public.app-category.games"
|
||||||
"gatekeeperAssess": false,
|
|
||||||
"entitlements": "build/entitlements.mac.plist",
|
|
||||||
"entitlementsInherit": "build/entitlements.mac.plist",
|
|
||||||
"forceCodeSigning": true,
|
|
||||||
"strictVerify": true,
|
|
||||||
"type": "distribution",
|
|
||||||
"notarize": false
|
|
||||||
},
|
},
|
||||||
"afterSign": "scripts/notarize.js",
|
|
||||||
"nsis": {
|
"nsis": {
|
||||||
"oneClick": false,
|
"oneClick": false,
|
||||||
"allowToChangeInstallationDirectory": true,
|
"allowToChangeInstallationDirectory": true,
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
console.log('[Notarize] Script loaded');
|
|
||||||
|
|
||||||
let notarize;
|
|
||||||
try {
|
|
||||||
notarize = require('@electron/notarize').notarize;
|
|
||||||
console.log('[Notarize] @electron/notarize loaded successfully');
|
|
||||||
} catch (err) {
|
|
||||||
console.error('[Notarize] Failed to load @electron/notarize:', err.message);
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
|
|
||||||
const path = require('path');
|
|
||||||
|
|
||||||
// Timeout for notarization (30 minutes max)
|
|
||||||
const NOTARIZE_TIMEOUT_MS = 30 * 60 * 1000;
|
|
||||||
|
|
||||||
function withTimeout(promise, ms, message) {
|
|
||||||
return Promise.race([
|
|
||||||
promise,
|
|
||||||
new Promise((_, reject) =>
|
|
||||||
setTimeout(() => reject(new Error(message)), ms)
|
|
||||||
)
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
exports.default = async function notarizing(context) {
|
|
||||||
console.log('[Notarize] afterSign hook called');
|
|
||||||
console.log('[Notarize] Context:', JSON.stringify({
|
|
||||||
platform: context.electronPlatformName,
|
|
||||||
appOutDir: context.appOutDir,
|
|
||||||
outDir: context.outDir
|
|
||||||
}, null, 2));
|
|
||||||
|
|
||||||
const { electronPlatformName, appOutDir } = context;
|
|
||||||
|
|
||||||
// Only notarize macOS builds
|
|
||||||
if (electronPlatformName !== 'darwin') {
|
|
||||||
console.log('[Notarize] Skipping: not macOS');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if notarization is disabled via env var
|
|
||||||
if (process.env.SKIP_NOTARIZE === 'true') {
|
|
||||||
console.log('[Notarize] Skipping: SKIP_NOTARIZE=true');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check credentials
|
|
||||||
const hasAppleId = !!process.env.APPLE_ID;
|
|
||||||
const hasPassword = !!process.env.APPLE_APP_SPECIFIC_PASSWORD;
|
|
||||||
const hasTeamId = !!process.env.APPLE_TEAM_ID;
|
|
||||||
|
|
||||||
console.log('[Notarize] Credentials check:', { hasAppleId, hasPassword, hasTeamId });
|
|
||||||
|
|
||||||
if (!hasAppleId || !hasPassword || !hasTeamId) {
|
|
||||||
console.log('[Notarize] Skipping: missing credentials');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const appName = context.packager.appInfo.productFilename;
|
|
||||||
const appPath = path.join(appOutDir, `${appName}.app`);
|
|
||||||
|
|
||||||
console.log('[Notarize] Starting notarization...');
|
|
||||||
console.log('[Notarize] App path:', appPath);
|
|
||||||
console.log('[Notarize] Team ID:', process.env.APPLE_TEAM_ID);
|
|
||||||
console.log('[Notarize] Timeout:', NOTARIZE_TIMEOUT_MS / 1000, 'seconds');
|
|
||||||
|
|
||||||
try {
|
|
||||||
await withTimeout(
|
|
||||||
notarize({
|
|
||||||
appPath,
|
|
||||||
appleId: process.env.APPLE_ID,
|
|
||||||
appleIdPassword: process.env.APPLE_APP_SPECIFIC_PASSWORD,
|
|
||||||
teamId: process.env.APPLE_TEAM_ID,
|
|
||||||
}),
|
|
||||||
NOTARIZE_TIMEOUT_MS,
|
|
||||||
`Notarization timed out after ${NOTARIZE_TIMEOUT_MS / 1000} seconds`
|
|
||||||
);
|
|
||||||
console.log('[Notarize] Notarization complete!');
|
|
||||||
} catch (error) {
|
|
||||||
console.error('[Notarize] Notarization failed:', error.message);
|
|
||||||
|
|
||||||
// Don't fail the build if notarization times out or fails
|
|
||||||
// The app will still be code-signed, just not notarized
|
|
||||||
if (process.env.NOTARIZE_FAIL_ON_ERROR !== 'true') {
|
|
||||||
console.warn('[Notarize] Continuing build without notarization (set NOTARIZE_FAIL_ON_ERROR=true to fail)');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Reference in New Issue
Block a user