From 0df5ff13c1610dcfb580c50236078dbc9a8943dc Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <thomas.nordquist@viison.com>
Date: Mon, 14 Jan 2019 15:28:24 +0100
Subject: [PATCH] Update publish settings

---
 package-with-docker.sh |  3 ++-
 package.ts             |  8 ++++----
 prepare-release.sh     | 10 ----------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/package-with-docker.sh b/package-with-docker.sh
index 92e257d..e77b13f 100755
--- a/package-with-docker.sh
+++ b/package-with-docker.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+
 docker run --rm -ti \
+ --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_') \
  --env ELECTRON_CACHE="/root/.cache/electron" \
  --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
- --env GH_TOKEN="$GH_TOKEN" \
  -v ${PWD}:/project \
  -v ~/.cache/electron:/root/.cache/electron \
  -v ~/.cache/electron-builder:/root/.cache/electron-builder \
diff --git a/package.ts b/package.ts
index 845eb8f..ddf8c7c 100644
--- a/package.ts
+++ b/package.ts
@@ -7,7 +7,7 @@ const linux: builder.CliOptions = {
   arm64: true,
   linux: ['AppImage', 'deb', 'rpm', 'pacman', 'tar.gz'],
   projectDir: './build/clean',
-  publish: 'onTag',
+  publish: 'always',
 }
 
 const linuxSnap: builder.CliOptions = {
@@ -17,7 +17,7 @@ const linuxSnap: builder.CliOptions = {
   arm64: true,
   linux: ['snap'],
   projectDir: './build/clean',
-  publish: 'onTag',
+  publish: 'always',
 }
 
 const win: builder.CliOptions = {
@@ -27,7 +27,7 @@ const win: builder.CliOptions = {
   arm64: false,
   win: ['portable', 'nsis'],
   projectDir: './build/clean',
-  publish: 'onTag',
+  publish: 'always',
 }
 
 const mac: builder.CliOptions = {
@@ -37,7 +37,7 @@ const mac: builder.CliOptions = {
   arm64: false,
   mac: ['dmg'],
   projectDir: './build/clean',
-  publish: 'onTag',
+  publish: 'always',
 }
 
 async function executeBuild() {
diff --git a/prepare-release.sh b/prepare-release.sh
index 9f7ebe2..3fc58e3 100755
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -26,13 +26,3 @@ cd ..
 npm run build
 rm -rf app/node_modules
 cd "$ORIGINAL_DIR"
-
-exit 0
-docker run --rm -ti \
- --env ELECTRON_CACHE="/root/.cache/electron" \
- --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
- --env GH_TOKEN="$GH_TOKEN" \
- -v ${PWD}:/project \
- -v ~/.cache/electron:/root/.cache/electron \
- -v ~/.cache/electron-builder:/root/.cache/electron-builder \
- electronuserland/builder:wine node_modules/.bin/ts-node build.ts