rm squirrel

Kong · Aug 14, 2024 · 3dbbc42 · 3dbbc42
1 parent 90a69bc
commit 3dbbc42
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 59 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -166,7 +166,6 @@ jobs:
           name: ${{ matrix.os }}-artifacts
           path: |
             packages/insomnia/dist/*.exe
-            packages/insomnia/dist/squirrel-windows/*
             packages/insomnia/dist/*.zip
             packages/insomnia/dist/*.dmg
             packages/insomnia/dist/*.snap

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -94,7 +94,7 @@ jobs:
           password: ${{secrets.ES_PASSWORD}}
           credential_id: ${{secrets.ES_CREDENTIAL_ID}}
           totp_secret: ${{secrets.ES_TOTP_SECRET}}
-          file_path: ${GITHUB_WORKSPACE}/artifacts/windows-latest-artifacts/insomnia/dist/squirrel-windows/Insomnia.Core-${{ env.RELEASE_VERSION }}.exe
+          file_path: ${GITHUB_WORKSPACE}/artifacts/windows-latest-artifacts/insomnia/dist/Insomnia.Core-${{ env.RELEASE_VERSION }}.exe
           override: true
 
       - name: Create Tag and Release
@@ -117,10 +117,7 @@ jobs:
         with:
           release_id: ${{ steps.core_tag_and_release.outputs.id }}
           tag_name: ${{ env.RELEASE_CORE_TAG }}
-          file: "./artifacts/*-artifacts/insomnia/dist/Insomnia.*;./artifacts/*-artifacts/insomnia/dist/squirrel-windows/*;./artifacts/*-artifacts/insomnia-inso/artifacts/inso-*;./artifacts/**/*sbom.{spdx,cyclonedx}.json"
-          # /github/workspace/artifacts/windows-latest-artifacts/***/dist/squirrel-windows/Insomnia.Core-9.3.0-beta.1.exe
-          # /github/workspace/artifacts/windows-latest-artifacts/***/dist/squirrel-windows/Insomnia.Core-9.3.0-beta.1-full.nupkg
-          # /github/workspace/artifacts/windows-latest-artifacts/***/dist/squirrel-windows/RELEASES
+          file: "./artifacts/*-artifacts/insomnia/dist/Insomnia.*;./artifacts/*-artifacts/insomnia-inso/artifacts/inso-*;./artifacts/**/*sbom.{spdx,cyclonedx}.json"
           # /home/runner/work/***/***/artifacts/macos-13-artifacts/***/dist/Insomnia.Core-9.3.0-alpha.7.dmg
           # /home/runner/work/***/***/artifacts/ubuntu-latest-artifacts/***/dist/Insomnia.Core-9.3.0-alpha.7.deb
           # /home/runner/work/***/***/artifacts/ubuntu-latest-artifacts/***-inso/artifacts/inso-linux-9.3.0-alpha.7.tar.xz

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
@@ -139,7 +139,6 @@
     "deep-equal": "^1.0.1",
     "electron": "30.2.0",
     "electron-builder": "24.13.3",
-    "electron-builder-squirrel-windows": "24.13.3",
     "electron-devtools-installer": "^3.2.0",
     "esbuild": "^0.20.2",
     "esbuild-plugin-alias": "0.2.1",

diff --git a/packages/insomnia/src/main.development.ts b/packages/insomnia/src/main.development.ts
@@ -19,7 +19,6 @@ import { registerCurlHandlers } from './main/network/curl';
 import { registerWebSocketHandlers } from './main/network/websocket';
 import { watchProxySettings } from './main/proxy';
 import { initializeSentry, sentryWatchAnalyticsEnabled } from './main/sentry';
-import { checkIfRestartNeeded } from './main/squirrel-startup';
 import * as updates from './main/updates';
 import * as windowUtils from './main/window-utils';
 import * as models from './models/index';
@@ -38,9 +37,9 @@ initializeSentry();
 registerInsomniaProtocols();
 
 // Handle potential auto-update
-if (checkIfRestartNeeded()) {
-  process.exit(0);
-}
+// if (checkIfRestartNeeded()) {
+//   process.exit(0);
+// }
 
 initializeLogging();
 log.info(`Running version ${getAppVersion()}`);

diff --git a/packages/insomnia/src/main/squirrel-startup.ts b/packages/insomnia/src/main/squirrel-startup.ts