From dbb6ead7bac9133b894a8c77aa4c27b5febc740a Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <xxnerowingerxx@gmail.com>
Date: Sat, 25 Apr 2020 14:04:46 +0200
Subject: [PATCH] Fix builds and snap upload

---
 .travis.yml                   |   8 +++++++-
 res/snapstore-credentials.enc | Bin 0 -> 2368 bytes
 scripts/prepare-release.ts    |   2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 res/snapstore-credentials.enc

diff --git a/.travis.yml b/.travis.yml
index 0965ca5..22e9731 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,12 @@ script:
   - export TRAVIS_BUILD_NUMBER="" # Override travis build number since it is uses for tagging the binary version https://github.com/electron-userland/electron-builder/issues/3730
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -e GH_TOKEN=$GH_TOKEN -e GIT_TAG=$TRAVIS_TAG --rm -v `pwd`:/app thomasnordquist/ui-test-recording-env sh -c "cd app && docker/testMounted.sh"; fi
   - if [[ "$TRAVIS_TAG" != "" ]]; then yarn run prepare-release; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package linux; fi
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then
+      openssl aes-256-cbc -d -in res/snapstore-credentials.enc -out credentials -k $SNAPSTORE_CREDENTIALS_DECRYPTION_KEY;
+      snapcraft login --with credentials;
+      rm credentials;
+      yarn run package linux;
+    fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- mac; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then unset CSC_LINK; yarn run package -- win; fi
diff --git a/res/snapstore-credentials.enc b/res/snapstore-credentials.enc
new file mode 100644
index 0000000000000000000000000000000000000000..975956630d5e6ef24bdf0ccafddb0381ba5e20bf
GIT binary patch
literal 2368
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

literal 0
HcmV?d00001

diff --git a/scripts/prepare-release.ts b/scripts/prepare-release.ts
index 6338666..8301645 100644
--- a/scripts/prepare-release.ts
+++ b/scripts/prepare-release.ts
@@ -28,7 +28,7 @@ async function prepareRelease() {
 
   // Clean up
   await fs.remove('node_modules')
-  // await exec('yarn', ['install', '--production']) // Do not clean up, electron version detection will fail otherwise
+  await exec('yarn', ['install', '--production']) // Do not clean up, electron version detection will fail otherwise
   await fs.remove(path.join('app', 'node_modules'))
 
   chdir(originalDir)