chore: merge the nightly builds into the main 'ferdi' project (#1996)

4 files changed, 4 insertions, 14 deletions

diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index f0b6d7900..199ec95bf 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -171,7 +171,7 @@ jobs:
         shell: bash
       - name: Build Ferdi with publish for 'nightly' branch
         if: ${{ env.GIT_BRANCH_NAME == 'nightly' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies
+        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }}
@@ -285,7 +285,7 @@ jobs:
         run: |
           sudo snap install snapcraft --classic
           echo "$SNAPCRAFT_LOGIN" | snapcraft login --with -
-          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge
+          npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.snap.publish.provider=snapStore -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge
           snapcraft logout
         shell: bash
       - name: Build Ferdi with publish for 'release' beta branch
@@ -404,7 +404,7 @@ jobs:
         shell: bash
       - name: Build Ferdi with publish for 'nightly' branch
         if: ${{ env.GIT_BRANCH_NAME == 'nightly' }}
-        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }} -c.publish.repo=nightlies
+        run: npm run build -- --publish always -c.publish.provider=github -c.publish.owner=${{ github.repository_owner }}
         shell: bash
         env:
           GH_TOKEN: ${{ secrets.FERDI_PUBLISH_TOKEN }}
diff --git a/README.md b/README.md
index 16de4de6f..849f0af8a 100644
--- a/README.md
+++ b/README.md
@@ -245,7 +245,7 @@ We welcome all contributors. Please read the [contributing guidelines](CONTRIBUT
 
 ## Nightly releases
 
-Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/nightlies](https://github.com/getferdi/nightlies/releases). Maintainers still need to manually publish the draft releases as pre-releases for now.
+Nightly releases are automatically triggered every day ([details](https://github.com/getferdi/ferdi/pull/990)) and available in [getferdi/ferdi](https://github.com/getferdi/ferdi/releases). Maintainers still need to verify and manually publish the draft releases as pre-releases for now.
 
 ## Troubleshooting recipes (self-help)
 
diff --git a/src/config.ts b/src/config.ts
index 6ad58c7a5..667b0a962 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -158,10 +158,6 @@ export const FRANZ_SERVICE_REQUEST = `${GITHUB_FERDI_URL}/recipes/issues`;
 export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi';
 export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub';
 
-export const GITHUB_ORG_NAME = 'getferdi';
-export const GITHUB_FERDI_REPO_NAME = 'ferdi';
-export const GITHUB_NIGHTLIES_REPO_NAME = 'nightlies';
-
 export const FILE_SYSTEM_SETTINGS_TYPES = ['app', 'proxy'];
 
 export const LOCAL_SERVER = 'You are using Ferdi without a server';
diff --git a/src/electron/ipc-api/autoUpdate.ts b/src/electron/ipc-api/autoUpdate.ts
index 31c614ab7..e6b805edc 100644
--- a/src/electron/ipc-api/autoUpdate.ts
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -1,6 +1,5 @@
 import { app, ipcMain, BrowserWindow } from 'electron';
 import { autoUpdater } from 'electron-updater';
-import { GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
 import { isMac, isWindows } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
@@ -26,11 +25,6 @@ export default (params: { mainWindow: BrowserWindow; settings: any }) => {
               params.settings.app.get('nightly'),
             );
             autoUpdater.channel = 'alpha';
-            autoUpdater.setFeedURL({
-              provider: 'github',
-              owner: GITHUB_ORG_NAME,
-              repo: GITHUB_NIGHTLIES_REPO_NAME,
-            });
           }
 
           if (args.action === 'check') {