From 50b39e862530af236b932aa58c5c7f9854f1abf8 Mon Sep 17 00:00:00 2001
From: Jan Willem Eriks <janwillemeriks@gmail.com>
Date: Fri, 30 Sep 2022 12:30:23 +0200
Subject: [PATCH] Fix CI/CD

---
 .github/workflows/main.yml | 14 ++++++++------
 package.json               |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index faa16e3..c414d8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,10 +19,10 @@ jobs:
         sudo apt-get install flatpak -y
         sudo apt-get install flatpak-builder -y
         sudo apt-get install elfutils -y
-        sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-        sudo flatpak install flathub org.freedesktop.Platform/x86_64/20.08 org.freedesktop.Sdk/x86_64/20.08 org.electronjs.Electron2.BaseApp/x86_64/stable -y
+        flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+        flatpak install flathub org.freedesktop.Platform/x86_64/20.08 org.freedesktop.Sdk/x86_64/20.08 org.electronjs.Electron2.BaseApp/x86_64/stable -y
         npm install
-        GH_TOKEN=${{ secrets.GH_TOKEN }} && npm run publish-linux-app
+        GH_TOKEN=${{ secrets.GITHUB_TOKEN }} npm run publish-linux-app
         
   macos:
       runs-on: macOS-latest
@@ -36,9 +36,9 @@ jobs:
       - name: Install Modules and Publish build
         run: |
           npm install
-          GH_TOKEN=${{ secrets.GH_TOKEN }} && npm run publish-mac-app
+          GH_TOKEN=${{ secrets.GITHUB_TOKEN }} npm run publish-mac-app
           
-  windo:
+  windows:
       runs-on: windows-latest
       steps:
       - uses: actions/checkout@v3
@@ -48,6 +48,8 @@ jobs:
           node-version: 16
           
       - name: Install Modules and Publish build
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npm install
-          GH_TOKEN=${{ secrets.GH_TOKEN }} && npm run publish-win-app
+          npm run publish-win-app
diff --git a/package.json b/package.json
index 1a86581..0381c2d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "dist:msi": "npm run build && DEBUG=* electron-builder build -w nsis",
     "dist:pkg": "npm run build && DEBUG=* electron-builder build -m pkg",
     "publish-app": "npm run build && electron-builder -wl --publish always",
-    "publish-linux-app": "DEBUG=* npm run build && electron-builder -l --publish always",
+    "publish-linux-app": "npm run build && electron-builder -l --publish always",
     "publish-win-app": "npm run build && electron-builder -w --publish always",
     "publish-mac-app": "npm run build && electron-builder -m --publish always"
   },