Skip to content

Commit a94e60e

Browse files
HermesissHermesiss
committed
Update blockmaps
1 parent 1619f91 commit a94e60e

6 files changed

Lines changed: 45 additions & 18 deletions

File tree

‎.github/workflows/build-and-release.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
name: windows-artifacts
5858
path: |
5959
dist/DevNullifier-Setup.exe
60+
dist/DevNullifier-Setup.exe.blockmap
6061
dist/DevNullifier-win-unpacked.zip
6162
dist/latest.yml
6263
@@ -99,6 +100,7 @@ jobs:
99100
name: linux-artifacts
100101
path: |
101102
${{ steps.find-installer.outputs.appimage_path }}
103+
${{ steps.find-installer.outputs.appimage_path }}.blockmap
102104
${{ steps.find-installer.outputs.deb_path }}
103105
dist/DevNullifier-linux-unpacked.zip
104106
dist/latest-linux.yml
@@ -140,6 +142,7 @@ jobs:
140142
name: macos-artifacts
141143
path: |
142144
${{ steps.find-installer.outputs.dmg_path }}
145+
${{ steps.find-installer.outputs.dmg_path }}.blockmap
143146
dist/DevNullifier-mac-unpacked.zip
144147
dist/latest-mac.yml
145148
@@ -234,6 +237,16 @@ jobs:
234237
asset_name: DevNullifier-Setup.exe
235238
asset_content_type: application/octet-stream
236239

240+
- name: Upload Windows Installer Blockmap
241+
uses: actions/upload-release-asset@v1
242+
env:
243+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
244+
with:
245+
upload_url: ${{ steps.create_release.outputs.upload_url }}
246+
asset_path: artifacts/windows/DevNullifier-Setup.exe.blockmap
247+
asset_name: DevNullifier-Setup.exe.blockmap
248+
asset_content_type: application/octet-stream
249+
237250
- name: Upload latest.yml
238251
uses: actions/upload-release-asset@v1
239252
env:
@@ -273,6 +286,16 @@ jobs:
273286
asset_name: ${{ github.ref_name == 'develop' && 'DevNullifier-linux-x64-dev.AppImage' || 'DevNullifier-linux-x64.AppImage' }}
274287
asset_content_type: application/octet-stream
275288

289+
- name: Upload Linux AppImage Blockmap
290+
uses: actions/upload-release-asset@v1
291+
env:
292+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
293+
with:
294+
upload_url: ${{ steps.create_release.outputs.upload_url }}
295+
asset_path: ${{ steps.find-linux-files.outputs.appimage_path }}.blockmap
296+
asset_name: ${{ github.ref_name == 'develop' && 'DevNullifier-linux-x64-dev.AppImage.blockmap' || 'DevNullifier-linux-x64.AppImage.blockmap' }}
297+
asset_content_type: application/octet-stream
298+
276299
- name: Upload Linux DEB
277300
uses: actions/upload-release-asset@v1
278301
env:
@@ -320,6 +343,16 @@ jobs:
320343
asset_name: ${{ github.ref_name == 'develop' && 'DevNullifier-mac-x64-dev.dmg' || 'DevNullifier-mac-x64.dmg' }}
321344
asset_content_type: application/octet-stream
322345

346+
- name: Upload macOS DMG Blockmap
347+
uses: actions/upload-release-asset@v1
348+
env:
349+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
350+
with:
351+
upload_url: ${{ steps.create_release.outputs.upload_url }}
352+
asset_path: ${{ steps.find-macos-files.outputs.dmg_path }}.blockmap
353+
asset_name: ${{ github.ref_name == 'develop' && 'DevNullifier-mac-x64-dev.dmg.blockmap' || 'DevNullifier-mac-x64.dmg.blockmap' }}
354+
asset_content_type: application/octet-stream
355+
323356
- name: Upload macOS ZIP Archive
324357
uses: actions/upload-release-asset@v1
325358
env:
@@ -359,19 +392,22 @@ jobs:
359392
360393
# Upload Windows assets
361394
upload_asset "artifacts/windows/DevNullifier-Setup.exe" "DevNullifier-Setup.exe" "application/octet-stream"
395+
upload_asset "artifacts/windows/DevNullifier-Setup.exe.blockmap" "DevNullifier-Setup.exe.blockmap" "application/octet-stream"
362396
upload_asset "artifacts/windows/latest.yml" "latest.yml" "text/yaml"
363397
upload_asset "artifacts/windows/DevNullifier-win-unpacked.zip" "DevNullifier-win-unpacked.zip" "application/zip"
364398
365399
# Upload Linux assets
366400
APPIMAGE=$(find artifacts/linux -name "*.AppImage" -type f | head -1)
367401
DEB=$(find artifacts/linux -name "*.deb" -type f | head -1)
368402
upload_asset "$APPIMAGE" "DevNullifier-linux-x64.AppImage" "application/octet-stream"
403+
upload_asset "$APPIMAGE.blockmap" "DevNullifier-linux-x64.AppImage.blockmap" "application/octet-stream"
369404
upload_asset "$DEB" "DevNullifier-linux-x64.deb" "application/octet-stream"
370405
upload_asset "artifacts/linux/DevNullifier-linux-unpacked.zip" "DevNullifier-linux-unpacked.zip" "application/zip"
371406
upload_asset "artifacts/linux/latest-linux.yml" "latest-linux.yml" "text/yaml"
372407
373408
# Upload macOS assets
374409
DMG=$(find artifacts/macos -name "*.dmg" -type f | head -1)
375410
upload_asset "$DMG" "DevNullifier-mac-x64.dmg" "application/octet-stream"
411+
upload_asset "$DMG.blockmap" "DevNullifier-mac-x64.dmg.blockmap" "application/octet-stream"
376412
upload_asset "artifacts/macos/DevNullifier-mac-unpacked.zip" "DevNullifier-mac-unpacked.zip" "application/zip"
377413
upload_asset "artifacts/macos/latest-mac.yml" "latest-mac.yml" "text/yaml"

‎src/main/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function createWindow() {
4141
// Initialize update service
4242
updateService = new UpdateService(mainWindow);
4343
if (!isDev) {
44-
//updateService.checkForUpdates(); TODO: Uncomment this when ready to release
44+
updateService.checkForUpdates();
4545
}
4646
}
4747

‎src/main/preload.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ const api: ElectronAPI = {
119119
quitAndInstall: () => ipcRenderer.invoke("quit-and-install"),
120120

121121
// New handler
122-
setUpdateChannel: (channel: 'latest' | 'latest-develop') => ipcRenderer.invoke('set-update-channel', channel),
122+
setUpdateChannel: (channel: 'latest' | 'latest-dev') => ipcRenderer.invoke('set-update-channel', channel),
123123
};
124124

125125
contextBridge.exposeInMainWorld("electronAPI", api);

‎src/main/updateService.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,21 @@ export class UpdateService {
1414
private setupIpcHandlers() {
1515
ipcMain.handle(
1616
"set-update-channel",
17-
(_, channel: "latest" | "latest-develop") => {
17+
(_, channel: "latest" | "latest-dev") => {
1818
this.setUpdateChannel(channel);
1919
}
2020
);
2121
}
2222

23-
private setUpdateChannel(channel: "latest" | "latest-develop") {
24-
autoUpdater.allowPrerelease = channel === "latest-develop";
23+
private setUpdateChannel(channel: "latest" | "latest-dev") {
24+
autoUpdater.allowPrerelease = channel === "latest-dev";
2525

2626
let baseUrl =
2727
channel === "latest"
2828
? "https://github.com/Hermesiss/DevNullifier/releases/latest/download/"
2929
: "https://github.com/Hermesiss/DevNullifier/releases/download/latest-dev/";
3030

3131
autoUpdater.setFeedURL(baseUrl);
32-
33-
// Set platform-specific update config path
34-
// if (process.platform === "win32") {
35-
// autoUpdater.updateConfigPath = baseUrl + "latest.yml";
36-
// } else if (process.platform === "darwin") {
37-
// autoUpdater.updateConfigPath = baseUrl + "latest-mac.yml";
38-
// } else if (process.platform === "linux") {
39-
// autoUpdater.updateConfigPath = baseUrl + "latest-linux.yml";
40-
// }
4132
}
4233

4334
private initializeAutoUpdater() {

‎src/renderer/components/UpdateButton.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ function handleUpdateStatus(status: { message: string; data?: any }) {
131131
132132
async function handleBetaChannelChange() {
133133
localStorage.setItem('useBetaChannel', useBetaChannel.value.toString());
134-
await window.electronAPI.setUpdateChannel(useBetaChannel.value ? 'latest-develop' : 'latest');
134+
await window.electronAPI.setUpdateChannel(useBetaChannel.value ? 'latest-dev' : 'latest');
135135
checkForUpdates();
136136
}
137137
138-
onMounted(() => {
138+
onMounted(async () => {
139139
window.electronAPI.onUpdateStatus(handleUpdateStatus);
140140
// Set initial update channel
141-
window.electronAPI.setUpdateChannel(useBetaChannel.value ? 'latest-develop' : 'latest');
141+
await window.electronAPI.setUpdateChannel(useBetaChannel.value ? 'latest-dev' : 'latest');
142142
});
143143
144144
onUnmounted(() => {

‎src/renderer/types/common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export interface ElectronAPI {
5757
saveDeveloperProjects: (projects: ProjectInfo[]) => Promise<void>;
5858
loadSavedDeveloperProjects: () => Promise<ProjectInfo[]>;
5959
getSavedDeveloperProjectsCount: () => Promise<number>;
60-
setUpdateChannel: (channel: 'latest' | 'latest-develop') => Promise<void>;
60+
setUpdateChannel: (channel: 'latest' | 'latest-dev') => Promise<void>;
6161
}
6262

6363
// Add global type augmentation for Window interface

0 commit comments

Comments
 (0)