dev 2

seed-hypermedia · Dec 7, 2024 · 3ebf709 · 3ebf709
1 parent 734cd09
commit 3ebf709
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 36 deletions.
diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml
@@ -132,7 +132,7 @@ jobs:
           node scripts/set-desktop-version.mjs
         env:
           # VITE_VERSION: "${{ needs.build-info.outputs.version }}"
-          VITE_VERSION: "2025.1.1-dev.1"
+          VITE_VERSION: "2025.1.1-dev.2"
       - name: Build, package & make (Unix)
         if: matrix.config.os != 'windows-latest'
         run: |
@@ -143,7 +143,7 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           DAEMON_NAME: ${{ matrix.config.daemon_name }}
           # VITE_VERSION: "${{ needs.build-info.outputs.version }}"
-          VITE_VERSION: "2025.1.1-dev.1"
+          VITE_VERSION: "2025.1.1-dev.2"
           VITE_COMMIT_HASH: "${{ needs.build-info.outputs.commit_hash }}"
           VITE_DESKTOP_P2P_PORT: "56000"
           VITE_DESKTOP_HTTP_PORT: "56001"
@@ -169,7 +169,7 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           DAEMON_NAME: "${{ matrix.config.daemon_name }}.exe"
           # VITE_VERSION: "${{ needs.build-info.outputs.version }}"
-          VITE_VERSION: "2025.1.1-dev.1"
+          VITE_VERSION: "2025.1.1-dev.2"
           VITE_COMMIT_HASH: "${{ needs.build-info.outputs.commit_hash }}"
           VITE_DESKTOP_P2P_PORT: "56000"
           VITE_DESKTOP_HTTP_PORT: "56001"

diff --git a/frontend/apps/desktop/forge.config.ts b/frontend/apps/desktop/forge.config.ts
@@ -184,15 +184,15 @@ function buildDMGMaybe() {
       region: 'eu-west-2',
       s3ForcePathStyle: true,
       // Function to determine the S3 key (path) for each uploaded file
-      keyResolver: (filePath) => {
-        // If the file is 'latest.yml', place it in the 'latest/' directory
-        if (filePath.endsWith('latest.yml')) {
-          return 'dev/latest/latest.yml'
-        }
+      // keyResolver: (filePath) => {
+      //   // If the file is 'latest.yml', place it in the 'latest/' directory
+      //   if (filePath.endsWith('latest.yml')) {
+      //     return 'dev/latest/latest.yml'
+      //   }
 
-        // Otherwise, upload to the 'latest/' directory with the file name
-        return `dev/latest/${filePath.split('/').pop()}`
-      },
+      //   // Otherwise, upload to the 'latest/' directory with the file name
+      //   return `dev/latest/${filePath.split('/').pop()}`
+      // },
     }),
     new PublisherS3({
       bucket: 'seed-demo',
@@ -204,15 +204,15 @@ function buildDMGMaybe() {
       region: 'eu-west-2',
       s3ForcePathStyle: true,
 
-      keyResolver: (filePath) => {
-        // Upload 'latest.yml' to the versioned folder
-        if (filePath.endsWith('latest.yml')) {
-          return `dev/${version}/latest.yml`
-        }
+      // keyResolver: (filePath) => {
+      //   // Upload 'latest.yml' to the versioned folder
+      //   if (filePath.endsWith('latest.yml')) {
+      //     return `dev/${version}/latest.yml`
+      //   }
 
-        // Place other files in the versioned folder
-        return `dev/${process.env.VITE_VERSION}/${filePath.split('/').pop()}`
-      },
+      //   // Place other files in the versioned folder
+      //   return `dev/${process.env.VITE_VERSION}/${filePath.split('/').pop()}`
+      // },
     }),
   )
 }
@@ -242,12 +242,12 @@ function notarizeMaybe() {
   )
 
   // @ts-expect-error
-  config.packagerConfig.osxNotarize = {
-    // tool: 'notarytool',
-    appleId: process.env.APPLE_ID || '',
-    appleIdPassword: process.env.APPLE_ID_PASSWORD || '',
-    teamId: process.env.APPLE_TEAM_ID || '',
-  }
+  // config.packagerConfig.osxNotarize = {
+  //   // tool: 'notarytool',
+  //   appleId: process.env.APPLE_ID || '',
+  //   appleIdPassword: process.env.APPLE_ID_PASSWORD || '',
+  //   teamId: process.env.APPLE_TEAM_ID || '',
+  // }
 
   // @ts-expect-error
   config.packagerConfig.osxSign = {

diff --git a/frontend/apps/desktop/src/auto-update.ts b/frontend/apps/desktop/src/auto-update.ts
@@ -11,8 +11,15 @@ import log from 'electron-log/main'
 import {updateElectronApp, UpdateSourceType} from 'update-electron-app'
 
 export function defaultCheckForUpdates() {
-  autoUpdater.setFeedURL({
-    url: `https://seed-demo.s3.eu-west-2.amazonaws.com/dev/latest/RELEASES.json`,
+  // autoUpdater.setFeedURL({
+  //   url: `https://seed-demo.s3.eu-west-2.amazonaws.com/dev/latest/RELEASES.json`,
+  // })
+
+  updateElectronApp({
+    updateSource: {
+      type: UpdateSourceType.StaticStorage,
+      baseUrl: `https://seed-demo.s3.eu-west-2.amazonaws.com/dev/${process.platform}/${process.arch}`,
+    },
   })
 
   log.debug(`== FEED URL == ${autoUpdater.getFeedURL()}`)
@@ -158,12 +165,3 @@ export function linuxCheckForUpdates() {
   } catch (error) {}
   // ipcMain.emit(ipcMainEvents.CHECK_FOR_UPDATES_END)
 }
-
-export function autoUpdateSetup() {
-  updateElectronApp({
-    updateSource: {
-      type: UpdateSourceType.StaticStorage,
-      baseUrl: `https://seed-demo.s3.eu-west-2.amazonaws.com/dev/${process.platform}/${process.arch}`,
-    },
-  })
-}