Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a52d6b8fc | |||
| 255befd1b8 | |||
| 691b363f88 | |||
| 8972c3e363 | |||
| 5a8d77c494 |
@@ -75,7 +75,7 @@ jobs:
|
|||||||
CHANGED=$(git diff --name-only "$PREV_TAG"..HEAD)
|
CHANGED=$(git diff --name-only "$PREV_TAG"..HEAD)
|
||||||
echo "$CHANGED"
|
echo "$CHANGED"
|
||||||
|
|
||||||
# Files that require a full (installer) build
|
# Files that require a full (installer-only) release
|
||||||
FULL_TRIGGERS="electron-builder.yml|scripts/download-electron.js"
|
FULL_TRIGGERS="electron-builder.yml|scripts/download-electron.js"
|
||||||
|
|
||||||
if echo "$CHANGED" | grep -qE "^($FULL_TRIGGERS)$"; then
|
if echo "$CHANGED" | grep -qE "^($FULL_TRIGGERS)$"; then
|
||||||
@@ -105,13 +105,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: '22'
|
node-version: '22'
|
||||||
|
|
||||||
# Full build needs wine + system deps for electron-builder
|
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: |
|
run: |
|
||||||
sudo dpkg --add-architecture i386
|
dpkg --add-architecture i386
|
||||||
sudo apt-get update -qq
|
apt-get update -qq
|
||||||
sudo apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
wine wine32 wine64 \
|
wine wine32 wine64 \
|
||||||
libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2t64 \
|
libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2t64 \
|
||||||
libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 \
|
libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 \
|
||||||
@@ -123,39 +122,29 @@ jobs:
|
|||||||
if: steps.version-check.outputs.SKIP == 'false'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: npm ci --legacy-peer-deps
|
run: npm ci --legacy-peer-deps
|
||||||
|
|
||||||
# ── Patch release: asar only ──
|
|
||||||
|
|
||||||
- name: Build asar
|
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'patch'
|
|
||||||
run: npm run build:asar
|
|
||||||
|
|
||||||
# ── Full release: installer + asar ──
|
|
||||||
|
|
||||||
- name: Build source
|
- name: Build source
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Build Windows distributables
|
- name: Build Windows distributables
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
env:
|
env:
|
||||||
WINEDEBUG: "-all"
|
WINEDEBUG: "-all"
|
||||||
run: npx electron-builder --win -c.electronDist=node_modules/electron/dist-win --publish never
|
run: npx electron-builder --win -c.electronDist=node_modules/electron/dist-win --publish never
|
||||||
|
|
||||||
- name: Build Linux distributables
|
- name: Build Linux distributables
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: npx electron-builder --linux -c.electronDist=node_modules/electron/dist-linux --publish never
|
run: npx electron-builder --linux -c.electronDist=node_modules/electron/dist-linux --publish never
|
||||||
|
|
||||||
- name: Build asar for full release
|
- name: Build asar for patch updates
|
||||||
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'full'
|
if: steps.version-check.outputs.SKIP == 'false' && steps.release-type.outputs.TYPE == 'patch'
|
||||||
run: npm run build:asar
|
run: npm run build:asar
|
||||||
|
|
||||||
- name: Report build sizes
|
- name: Report build sizes
|
||||||
if: steps.version-check.outputs.SKIP == 'false'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
run: |
|
run: |
|
||||||
echo "=== Release type: ${{ steps.release-type.outputs.TYPE }} ==="
|
echo "=== Release type: ${{ steps.release-type.outputs.TYPE }} ==="
|
||||||
if [ "${{ steps.release-type.outputs.TYPE }}" = "full" ]; then
|
ls -lh out/*.exe out/*.AppImage out/*.deb 2>/dev/null || true
|
||||||
ls -lh out/*.exe out/*.AppImage out/*.deb 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
ls -lh out/asar/* 2>/dev/null || true
|
ls -lh out/asar/* 2>/dev/null || true
|
||||||
|
|
||||||
- name: Generate release notes
|
- name: Generate release notes
|
||||||
@@ -215,34 +204,36 @@ jobs:
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Upload asar + checksums (both patch and full releases)
|
# Upload asar + checksums (patch releases only — signals client to use fast path)
|
||||||
for file in out/asar/app.asar out/asar/checksums.sha256; do
|
if [ "$RELEASE_TYPE" = "patch" ]; then
|
||||||
|
for file in out/asar/app.asar out/asar/checksums.sha256; do
|
||||||
|
[ -f "$file" ] || continue
|
||||||
|
FILENAME=$(basename "$file")
|
||||||
|
echo "Uploading: $FILENAME ($(du -h "$file" | cut -f1))"
|
||||||
|
curl -s -X POST \
|
||||||
|
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$FILENAME" \
|
||||||
|
-H "Authorization: token $GITEA_TOKEN" \
|
||||||
|
-F "attachment=@$file" \
|
||||||
|
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo "Full release — skipping asar upload (forces installer update)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Upload installers (always — for new users and major updates)
|
||||||
|
for file in out/*.exe out/*.AppImage out/*.deb; do
|
||||||
[ -f "$file" ] || continue
|
[ -f "$file" ] || continue
|
||||||
FILENAME=$(basename "$file")
|
FILENAME=$(basename "$file")
|
||||||
echo "Uploading: $FILENAME ($(du -h "$file" | cut -f1))"
|
SAFE_NAME=$(echo "$FILENAME" | tr ' ' '_')
|
||||||
|
echo "Uploading: $SAFE_NAME ($(du -h "$file" | cut -f1))"
|
||||||
curl -s -X POST \
|
curl -s -X POST \
|
||||||
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$FILENAME" \
|
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$SAFE_NAME" \
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
-H "Authorization: token $GITEA_TOKEN" \
|
||||||
-F "attachment=@$file" \
|
-F "attachment=@$file" \
|
||||||
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
||||||
done
|
done
|
||||||
|
|
||||||
# Upload installer artifacts (full release only)
|
echo "All assets uploaded"
|
||||||
if [ "$RELEASE_TYPE" = "full" ]; then
|
|
||||||
for file in out/*.exe out/*.AppImage out/*.deb; do
|
|
||||||
[ -f "$file" ] || continue
|
|
||||||
FILENAME=$(basename "$file")
|
|
||||||
SAFE_NAME=$(echo "$FILENAME" | tr ' ' '_')
|
|
||||||
echo "Uploading: $SAFE_NAME ($(du -h "$file" | cut -f1))"
|
|
||||||
curl -s -X POST \
|
|
||||||
"$GITEA_BASE/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=$SAFE_NAME" \
|
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
|
||||||
-F "attachment=@$file" \
|
|
||||||
| jq -r '" -> \(.name) (\(.size) bytes)"'
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "All assets uploaded (release type: $RELEASE_TYPE)"
|
|
||||||
|
|
||||||
- name: Prune old releases
|
- name: Prune old releases
|
||||||
if: steps.version-check.outputs.SKIP == 'false'
|
if: steps.version-check.outputs.SKIP == 'false'
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "krunker-civilian-client",
|
"name": "krunker-civilian-client",
|
||||||
"version": "0.7.6",
|
"version": "0.7.8",
|
||||||
"description": "Cross-platform Krunker game client",
|
"description": "Cross-platform Krunker game client",
|
||||||
"main": "dist/main/index.js",
|
"main": "dist/main/index.js",
|
||||||
"homepage": "https://github.com/bigjakk/Krunker-Civilian-Client",
|
"homepage": "https://github.com/bigjakk/Krunker-Civilian-Client",
|
||||||
|
|||||||
+6
-5
@@ -1,6 +1,7 @@
|
|||||||
import { app, BrowserWindow, Menu, clipboard, ipcMain, safeStorage, session, shell } from 'electron';
|
import { app, BrowserWindow, Menu, clipboard, ipcMain, safeStorage, session, shell } from 'electron';
|
||||||
import { join, dirname } from 'path';
|
import { join, dirname } from 'path';
|
||||||
import { existsSync, mkdirSync, unlinkSync, promises as fsp } from 'fs';
|
import { existsSync, mkdirSync, promises as fsp } from 'fs';
|
||||||
|
import { existsSync as origExistsSync, unlinkSync as origUnlinkSync } from 'original-fs';
|
||||||
import { get as httpsGet } from 'https';
|
import { get as httpsGet } from 'https';
|
||||||
import { execFile } from 'child_process';
|
import { execFile } from 'child_process';
|
||||||
import * as os from 'os';
|
import * as os from 'os';
|
||||||
@@ -179,8 +180,8 @@ app.whenReady().then(async () => {
|
|||||||
// Clean up stale pending asar from a previous failed swap
|
// Clean up stale pending asar from a previous failed swap
|
||||||
const resourcesDir = join(dirname(app.getPath('exe')), 'resources');
|
const resourcesDir = join(dirname(app.getPath('exe')), 'resources');
|
||||||
const stalePending = join(resourcesDir, 'app-pending.asar');
|
const stalePending = join(resourcesDir, 'app-pending.asar');
|
||||||
if (existsSync(stalePending)) {
|
if (origExistsSync(stalePending)) {
|
||||||
try { unlinkSync(stalePending); } catch { /* ignore */ }
|
try { origUnlinkSync(stalePending); } catch { /* ignore */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -213,8 +214,8 @@ app.whenReady().then(async () => {
|
|||||||
} catch (err) {
|
} catch (err) {
|
||||||
electronLog.error('[KCC] Patch download failed:', err);
|
electronLog.error('[KCC] Patch download failed:', err);
|
||||||
// Clean up failed download
|
// Clean up failed download
|
||||||
if (existsSync(pendingPath)) {
|
if (origExistsSync(pendingPath)) {
|
||||||
try { unlinkSync(pendingPath); } catch { /* ignore */ }
|
try { origUnlinkSync(pendingPath); } catch { /* ignore */ }
|
||||||
}
|
}
|
||||||
if (!updateWin.isDestroyed()) updateWin.close();
|
if (!updateWin.isDestroyed()) updateWin.close();
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -1,5 +1,7 @@
|
|||||||
import { get as httpsGet } from 'https';
|
import { get as httpsGet } from 'https';
|
||||||
import { createReadStream, createWriteStream, writeFileSync, renameSync, unlinkSync, existsSync, mkdirSync } from 'fs';
|
// Use original-fs to bypass Electron's asar interception — required for
|
||||||
|
// writing/renaming .asar files in the resources directory.
|
||||||
|
import { createReadStream, createWriteStream, writeFileSync, renameSync, unlinkSync, existsSync, mkdirSync } from 'original-fs';
|
||||||
import { join, dirname } from 'path';
|
import { join, dirname } from 'path';
|
||||||
import { createHash } from 'crypto';
|
import { createHash } from 'crypto';
|
||||||
import { spawn } from 'child_process';
|
import { spawn } from 'child_process';
|
||||||
|
|||||||
+1
-1
@@ -20,7 +20,7 @@ export default defineConfig({
|
|||||||
outDir: 'dist/main',
|
outDir: 'dist/main',
|
||||||
emptyDirBefore: true,
|
emptyDirBefore: true,
|
||||||
rollupOptions: {
|
rollupOptions: {
|
||||||
external: ['electron', 'electron-store', ...nodeBuiltins],
|
external: ['electron', 'electron-store', 'original-fs', ...nodeBuiltins],
|
||||||
},
|
},
|
||||||
target: 'node20',
|
target: 'node20',
|
||||||
minify: isProd,
|
minify: isProd,
|
||||||
|
|||||||
Reference in New Issue
Block a user