From 10a307f45bbbf3301e9b20fba526c671cf6290bb Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Mon, 25 Apr 2022 21:30:06 -0500
Subject: [PATCH 01/26] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4b2b54da..34d1257f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "cider",
   "applicationId": "Cider",
   "productName": "Cider",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.",
   "license": "AGPL-3.0",
   "main": "./build/index.js",

From 8ef2ca6b6542fdad8f8bed331c77e7e0dcabaa3a Mon Sep 17 00:00:00 2001
From: cryptofyre <cryptofyre@cryptofyre.org>
Date: Mon, 25 Apr 2022 21:31:35 -0500
Subject: [PATCH 02/26] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 34d1257f..4b2b54da 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "cider",
   "applicationId": "Cider",
   "productName": "Cider",
-  "version": "1.4.5",
+  "version": "1.4.4",
   "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.",
   "license": "AGPL-3.0",
   "main": "./build/index.js",

From b0c4240c17e0dcd6c869d92ae88ed9a6293aad65 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Sat, 30 Apr 2022 18:37:21 +0100
Subject: [PATCH 03/26] Update config.yml

---
 .circleci/config.yml | 162 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 130 insertions(+), 32 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62dc1183..c9484eb6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,18 +1,21 @@
 version: 2.1
-orbs: # adds orbs to your configuration
-  jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
-branches:
-      only:
-        - main
-        - develop
-jobs:
-  build:
-    working_directory: ~/Cider
+
+executors:
+  cider-ci:
     docker:
       - image: circleci/node:16
-      
+    working_directory: ~/Cider
+
+orbs: # adds orbs to your configuration
+  jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
+
+# The jobs for this project
+jobs:
+  prepare-build:
+    executor: cider-ci
     steps:
       - checkout
+      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -32,50 +35,145 @@ jobs:
           paths:
             - ~/.cache/yarn
       - run:
-          name: Install system build dependencies
-          command: |
-            sudo apt-get update -y
-            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-            sudo apt-get install -y dpkg fakeroot wine64
-            sudo dpkg --add-architecture i386
-            sudo apt-get update -y
-            sudo apt-get install -y wine32
-            sudo apt install -y gh
+          name: TypeScript Compile
+          command: yarn build
+      - persist_to_workspace:
+          # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
+          # taken to be the root directory of the workspace.
+          root: .
+          # Must be relative path from root
+          paths:
+            - node_modules
+            - build
+            - resources
+            - yarn.lock
+            - package.json
+            - winget.json # winget.json is a file that is generated by the winget package manager
+            - LICENSE
+            - license.txt
+
+  build-linux:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
-      - run:
-          name: TypeScript Compile
-          command: yarn build
       - run:
           name: Generate Builds (Linux)
           command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist/*.deb
+            - dist/*.AppImage
+            - dist/*.snap
+            - dist/latest-linux.yml
+
+  build-windows:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider
+      - run:
+          name: Install Windows System Build Dependencies
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
           command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist/*.exe
+            - dist/Cider-Setup-*.exe.blockmap
+            - dist/latest.yml
+
+  build-winget:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider
+      - run:
+          name: Install Windows System Build Dependencies
+          command: |
+            sudo apt-get update -y
+            sudo apt-get install -y dpkg fakeroot wine64
+            sudo dpkg --add-architecture i386
+            sudo apt-get update -y
+            sudo apt-get install -y wine32
+      - run:
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
           command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist/*.exe
+            - dist/Cider-Setup-winget-*.exe.blockmap
+
+  release:
+    executor: cider-ci
+    steps:
+      - attach_workspace:
+          at: ~/Cider/
+      - run:
+          name: Installing GitHub Command Line Interface
+          command: |
+            sudo apt-get update -y
+            curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+            sudo apt-get update -y
+            sudo apt install -y gh
       - run:
           name: Move Build Files
           command: |
-              mkdir ~/Cider/dist/artifacts/
-              mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
-              mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
+            mkdir ~/Cider/dist/artifacts/
+            mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts
+            mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
       - store_artifacts:
-          path: ~/Cider/dist/artifacts 
+          path: ~/Cider/dist/artifacts
       - run:
           name: Publish Release
           command: |
-              gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+
+# Orchestrate our job run sequence
+workflows:
+  build_and_release:
+    jobs:
+      - prepare-build
+      - build-windows:
+          requires:
+            - prepare-build
+      - build-linux:
+          requires:
+            - prepare-build
+      - build-winget:
+          requires:
+            - prepare-build
+      - release:
+          requires:
+            - build-windows
+            - build-linux
+            - build-winget

From 6940c8bf7e146e7a50bf5f1705301db4aa912385 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:15:22 +0100
Subject: [PATCH 04/26] Fixed the fails

---
 .circleci/config.yml |  2 +-
 resources/circle.js  | 56 +++++++++++++++++++++-----------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c9484eb6..91941e53 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ executors:
       - image: circleci/node:16
     working_directory: ~/Cider
 
-orbs: # adds orbs to your configuration
+orbs: # Add orbs to your configuration
   jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible
 
 # The jobs for this project
diff --git a/resources/circle.js b/resources/circle.js
index dcf1d0ef..8a4a2ccb 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -1,53 +1,51 @@
-
-
 if (!process.env['CIRCLECI']) {
-    console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`)
-    return
+	console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`)
+	return
 }
 
 let fs = require('fs')
 
 
-var data = fs.readFileSync('package.json');
-var package = JSON.parse(data);
-
-
+const data = fs.readFileSync('package.json');
+const pkg = JSON.parse(data.toString());
 
 let channel;
 if (process.env['CIRCLE_BRANCH'] === 'lts') {
-    channel = 'latest'
+	channel = 'latest'
 } else if (process.env['CIRCLE_BRANCH'] === 'main') {
-    channel = 'beta'
+	channel = 'beta'
 } else if (process.env['CIRCLE_BRANCH'] === 'develop') {
-    channel = 'alpha'
+	channel = 'alpha'
 } else {
-    channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
+	channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
 }
 
 
+if (channel.concat('/')) {
+	channel.replace('/', '-')
+}
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
-var pvers = package.version.split('.')
-package.version = `${pvers[0]}.${pvers[1]}.${pvers[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
+const version = pkg.version.split('.');
+pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
 // package.build.channel = channel
-package.publish = {
-    "provider": "github",
-    "repo": "cider-releases",
-    "owner": "ciderapp",
-    "vPrefixedTagName": true,
-    "tag": `v${package.version}`,
-    "channel": channel,
-    "releaseType": "release"
+pkg.publish = {
+	"provider": "github",
+	"repo": "cider-releases",
+	"owner": "ciderapp",
+	"vPrefixedTagName": true,
+	"tag": `v${pkg.version}`,
+	"channel": channel,
+	"releaseType": "release"
 }
 
 let {exec} = require('child_process')
-exec('echo $APP_VERSION', {env: {'APP_VERSION': package.version}}, function (error, stdout, stderr)
-{
-    console.log(stdout, stderr, error);
+exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
+	console.log(stdout, stderr, error);
 });
-fs.writeFile('package.json', JSON.stringify(package), err => {
-    // error checking
-    if(err) throw err;
-    console.log(`VERSION CHANGED TO ${package.version}`);
+fs.writeFile('package.json', JSON.stringify(pkg), err => {
+	// error checking
+	if (err) throw err;
+	console.log(`VERSION CHANGED TO ${pkg.version}`);
 });
 

From 4c2d64ef0dc9522548a0d62628c72224a6a042fe Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:18:01 +0100
Subject: [PATCH 05/26] shit

---
 .circleci/config.yml | 3 +--
 resources/circle.js  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 91941e53..c0038416 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,6 @@ jobs:
     executor: cider-ci
     steps:
       - checkout
-      - run: ls -la
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
@@ -27,7 +26,7 @@ jobs:
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
       - run:
-          name: Install Dependencies
+          name: Install Node Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
diff --git a/resources/circle.js b/resources/circle.js
index 8a4a2ccb..e6349ff5 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -21,7 +21,7 @@ if (process.env['CIRCLE_BRANCH'] === 'lts') {
 }
 
 
-if (channel.concat('/')) {
+if (channel.includes('/')) {
 	channel.replace('/', '-')
 }
 

From 561ee3fe82ef908018cccc6b5b7449ce1cb87d21 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:22:41 +0100
Subject: [PATCH 06/26] is this gonna work

---
 resources/circle.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/circle.js b/resources/circle.js
index e6349ff5..d62344b3 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -20,10 +20,7 @@ if (process.env['CIRCLE_BRANCH'] === 'lts') {
 	channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
 }
 
-
-if (channel.includes('/')) {
-	channel.replace('/', '-')
-}
+channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');

From a417e8680f287da3fc11983c2e214ab33fb7602e Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:38:37 +0100
Subject: [PATCH 07/26] im a bit dumb

---
 resources/circle.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/resources/circle.js b/resources/circle.js
index d62344b3..210690fe 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -3,24 +3,20 @@ if (!process.env['CIRCLECI']) {
 	return
 }
 
-let fs = require('fs')
+const {readFileSync, writeFile} = require('fs')
+const pkg = JSON.parse(readFileSync('package.json').toString());
 
+let channel = process.env['CIRCLE_BRANCH'];
 
-const data = fs.readFileSync('package.json');
-const pkg = JSON.parse(data.toString());
-
-let channel;
 if (process.env['CIRCLE_BRANCH'] === 'lts') {
 	channel = 'latest'
 } else if (process.env['CIRCLE_BRANCH'] === 'main') {
 	channel = 'beta'
 } else if (process.env['CIRCLE_BRANCH'] === 'develop') {
 	channel = 'alpha'
-} else {
-	channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support
 }
 
-channel.split('/').join('-')
+channel = channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');
@@ -36,11 +32,13 @@ pkg.publish = {
 	"releaseType": "release"
 }
 
-let {exec} = require('child_process')
+const {exec} = require('child_process')
+
 exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
 	console.log(stdout, stderr, error);
 });
-fs.writeFile('package.json', JSON.stringify(pkg), err => {
+
+writeFile('package.json', JSON.stringify(pkg), err => {
 	// error checking
 	if (err) throw err;
 	console.log(`VERSION CHANGED TO ${pkg.version}`);

From 3518542eeec3e5485b80121b3ae0775e73943877 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 05:51:11 +0100
Subject: [PATCH 08/26] only run on main now

---
 .circleci/config.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c0038416..a6d9791f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -161,18 +161,33 @@ jobs:
 workflows:
   build_and_release:
     jobs:
-      - prepare-build
+      - prepare-build:
+          filters:
+            branches:
+              only: main
       - build-windows:
           requires:
             - prepare-build
+          filters:
+            branches:
+              only: main
       - build-linux:
           requires:
             - prepare-build
+          filters:
+            branches:
+              only: main
       - build-winget:
           requires:
             - prepare-build
+          filters:
+            branches:
+              only: main
       - release:
           requires:
             - build-windows
             - build-linux
             - build-winget
+          filters:
+            branches:
+              only: main

From 010a2fdbc9e3a6d619bab7c6f75d331b26173883 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:00:19 +0100
Subject: [PATCH 09/26] test

---
 .circleci/config.yml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a6d9791f..7738f477 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,9 @@ jobs:
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+      - run:
+          name: Rename Repository
+          command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json
       - run:
           name: Update Package Managers
           command: sudo npm update -g npm yarn
@@ -61,7 +64,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p never
+          command: yarn electron-builder -l -p onTagOrDraft
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -90,7 +93,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p never
+          command: yarn electron-builder -w --x64 -p onTagOrDraft
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -118,7 +121,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
-          command: yarn electron-builder --win -c winget.json -p never
+          command: yarn electron-builder --win -c winget.json -p onTagOrDraft
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -162,27 +165,27 @@ workflows:
   build_and_release:
     jobs:
       - prepare-build:
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - build-windows:
           requires:
             - prepare-build
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - build-linux:
           requires:
             - prepare-build
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - build-winget:
           requires:
             - prepare-build
-          filters:
-            branches:
-              only: main
+#          filters:
+#            branches:
+#              only: main
       - release:
           requires:
             - build-windows

From e257018c5e04f75db1a777068366d641dce21878 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:00:35 +0100
Subject: [PATCH 10/26] oops

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7738f477..cb19f249 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,7 +164,7 @@ jobs:
 workflows:
   build_and_release:
     jobs:
-      - prepare-build:
+      - prepare-build
 #          filters:
 #            branches:
 #              only: main

From 499d40af6f8b7805f7719e95ebbd1c62731e9607 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:05:45 +0100
Subject: [PATCH 11/26] stop it now

---
 .circleci/config.yml | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb19f249..7021cabf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,6 +28,9 @@ jobs:
           name: Restore Yarn Package Cache
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
+      - run:
+          name: Move Lockfile
+          command: mv cider.lock yarn.lock
       - run:
           name: Install Node Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
@@ -165,27 +168,27 @@ workflows:
   build_and_release:
     jobs:
       - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - build-windows:
           requires:
             - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - build-linux:
           requires:
             - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - build-winget:
           requires:
             - prepare-build
-#          filters:
-#            branches:
-#              only: main
+      #          filters:
+      #            branches:
+      #              only: main
       - release:
           requires:
             - build-windows

From f35594c287b9e482e311003f2122e4d26211a4fb Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:06:59 +0100
Subject: [PATCH 12/26] Update config.yml

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7021cabf..7f0e5f24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
           command: mv cider.lock yarn.lock
       - run:
           name: Install Node Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn install --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
           key: yarn-packages-{{ checksum "cider.lock" }}

From 2fda5bab40c171eee407f7291f6cb8c27447f8ab Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:08:27 +0100
Subject: [PATCH 13/26] oops

---
 .circleci/config.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7f0e5f24..c0826a57 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,12 +28,9 @@ jobs:
           name: Restore Yarn Package Cache
           keys:
             - yarn-packages-{{ checksum "cider.lock" }}
-      - run:
-          name: Move Lockfile
-          command: mv cider.lock yarn.lock
       - run:
           name: Install Node Dependencies
-          command: yarn install --cache-folder ~/.cache/yarn
+          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
           key: yarn-packages-{{ checksum "cider.lock" }}

From 70a0e4dd72b60ad5215bd2fb88fd49f88cef9982 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:12:58 +0100
Subject: [PATCH 14/26] oops

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c0826a57..84afba1b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p onTagOrDraft
+          command: yarn electron-builder -l -p always
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -93,7 +93,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p onTagOrDraft
+          command: yarn electron-builder -w --x64 -p always
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -121,7 +121,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
-          command: yarn electron-builder --win -c winget.json -p onTagOrDraft
+          command: yarn electron-builder --win -c winget.json -p always
           post-steps:
             - jira/notify
       - persist_to_workspace:

From 1efa3c1e6580a73d732ee64963a96cc89e27986f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:24:16 +0100
Subject: [PATCH 15/26] test

---
 .circleci/config.yml | 3 +++
 resources/circle.js  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84afba1b..d180b1c0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,6 +59,9 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/Cider
+      - run:
+          name: Install Snap
+          command: sudo snap install snapcraft --classic
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
diff --git a/resources/circle.js b/resources/circle.js
index 210690fe..80e7c8cf 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -20,7 +20,7 @@ channel = channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');
-pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
+pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}`
 // package.build.channel = channel
 pkg.publish = {
 	"provider": "github",

From f88e2420084279281122241bc7736d550b67f8f3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:28:41 +0100
Subject: [PATCH 16/26] test

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d180b1c0..165e4340 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,7 +61,9 @@ jobs:
           at: ~/Cider
       - run:
           name: Install Snap
-          command: sudo snap install snapcraft --classic
+          command: |
+          sudo apt update
+          sudo apt install snapd
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From d457c573395d918242a9e77cece2e90e67c84c63 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:29:48 +0100
Subject: [PATCH 17/26] yml bad

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 165e4340..d15aafdf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,8 +62,8 @@ jobs:
       - run:
           name: Install Snap
           command: |
-          sudo apt update
-          sudo apt install snapd
+            sudo apt update
+            sudo apt install snapd
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 42384afa1f313de8464906f0d031e628fa45f845 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:37:39 +0100
Subject: [PATCH 18/26] test

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d15aafdf..0abfc335 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,8 +62,9 @@ jobs:
       - run:
           name: Install Snap
           command: |
-            sudo apt update
-            sudo apt install snapd
+            sudo apt update && sudo apt install -y snapd
+            sudo snap install snapcraft --edge --classic
+            /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From ee9f65ddb63c1f18b567037f6b0073234ff224ce Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:40:43 +0100
Subject: [PATCH 19/26] test

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0abfc335..8f50e672 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,6 +63,8 @@ jobs:
           name: Install Snap
           command: |
             sudo apt update && sudo apt install -y snapd
+            service snapd start
+            sudo systemctl start snapd.service
             sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:

From 5e8e8450dfdf765cebcfff0c74df14c6591ad8b0 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:43:26 +0100
Subject: [PATCH 20/26] fuk

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8f50e672..b3e4a939 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,6 @@ jobs:
           command: |
             sudo apt update && sudo apt install -y snapd
             service snapd start
-            sudo systemctl start snapd.service
             sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:

From f5a6724308eb08902c567c66f73ba822d534baac Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:49:11 +0100
Subject: [PATCH 21/26] test

---
 .circleci/config.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b3e4a939..62abab43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,9 +63,7 @@ jobs:
           name: Install Snap
           command: |
             sudo apt update && sudo apt install -y snapd
-            service snapd start
-            sudo snap install snapcraft --edge --classic
-            /snap/bin/snapcraft
+            docker run -v $(pwd):$(pwd) -t ubuntu:xenial sh -c "apt update -qq && apt install snapcraft -y && cd $(pwd) && snapcraft"
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 36e5720362f382d3a9a173054b1764eba28de0d3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:53:38 +0100
Subject: [PATCH 22/26] test

---
 .circleci/config.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 62abab43..70987eb6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,15 +55,17 @@ jobs:
             - license.txt
 
   build-linux:
-    executor: cider-ci
+    working_directory: ~/Cider
+    machine: true
     steps:
       - attach_workspace:
           at: ~/Cider
       - run:
-          name: Install Snap
+          name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
-            docker run -v $(pwd):$(pwd) -t ubuntu:xenial sh -c "apt update -qq && apt install snapcraft -y && cd $(pwd) && snapcraft"
+            sudo snap install snapcraft --edge --classic
+            /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script

From 7c90b03b244fccf445c8955b6d76db87e654a214 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 08:57:19 +0100
Subject: [PATCH 23/26] test

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70987eb6..37f8d306 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,8 @@ jobs:
           name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
+            sudo snap install core snapd
+            snap refresh core
             sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:

From a76e795bfa7f3c7756751145e05bd903cb6b7116 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 09:00:00 +0100
Subject: [PATCH 24/26] test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37f8d306..5952714f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,9 +64,9 @@ jobs:
           name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
+            sudo snap install snapcraft --edge --classic
             sudo snap install core snapd
             snap refresh core
-            sudo snap install snapcraft --edge --classic
             /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel

From 2c54d6c16613ed7d9bf44cfb92eb22388dbdcfcf Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 09:05:40 +0100
Subject: [PATCH 25/26] ok

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5952714f..206ddd8e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,9 +64,9 @@ jobs:
           name: Setup Snapcraft
           command: |
             sudo apt update && sudo apt install -y snapd
+            sudo snap install core
             sudo snap install snapcraft --edge --classic
-            sudo snap install core snapd
-            snap refresh core
+            sudo snap refresh core
             /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel

From c009514c9d2e46d0d68cfb81fb31faff07cb7437 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Mon, 2 May 2022 09:12:54 +0100
Subject: [PATCH 26/26] hmm

---
 .circleci/config.yml | 49 ++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 206ddd8e..2d7b5b75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,9 +18,9 @@ jobs:
       - run:
           name: Set App Version
           command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
-      - run:
-          name: Rename Repository
-          command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json
+      #      - run:
+      #          name: Rename Repository
+      #          command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json
       - run:
           name: Update Package Managers
           command: sudo npm update -g npm yarn
@@ -55,25 +55,16 @@ jobs:
             - license.txt
 
   build-linux:
-    working_directory: ~/Cider
-    machine: true
+    executor: cider-ci
     steps:
       - attach_workspace:
           at: ~/Cider
-      - run:
-          name: Setup Snapcraft
-          command: |
-            sudo apt update && sudo apt install -y snapd
-            sudo snap install core
-            sudo snap install snapcraft --edge --classic
-            sudo snap refresh core
-            /snap/bin/snapcraft
       - run:
           name: Fix Versioning and Add Channel
           command: yarn circle:script
       - run:
           name: Generate Builds (Linux)
-          command: yarn electron-builder -l -p always
+          command: yarn electron-builder -l -p never
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -102,7 +93,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Windows)
-          command: yarn electron-builder -w --x64 -p always
+          command: yarn electron-builder -w --x64 -p never
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -130,7 +121,7 @@ jobs:
           command: yarn circle:script
       - run:
           name: Generate Builds (Winget)
-          command: yarn electron-builder --win -c winget.json -p always
+          command: yarn electron-builder --win -c winget.json -p never
           post-steps:
             - jira/notify
       - persist_to_workspace:
@@ -173,28 +164,28 @@ jobs:
 workflows:
   build_and_release:
     jobs:
-      - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+      - prepare-build:
+          filters:
+            branches:
+              only: main
       - build-windows:
           requires:
             - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+          filters:
+            branches:
+              only: main
       - build-linux:
           requires:
             - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+          filters:
+            branches:
+              only: main
       - build-winget:
           requires:
             - prepare-build
-      #          filters:
-      #            branches:
-      #              only: main
+          filters:
+            branches:
+              only: main
       - release:
           requires:
             - build-windows