From cc6648bd9ce9bb2ce978dfc915305ca1ea943bce Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Sat, 16 Jan 2021 19:26:17 +0300
Subject: [PATCH] Update CI

---
 .github/workflows/builder.yml | 20 ++++++++++++--------
 tasks/config.js               |  2 +-
 tasks/rainloop.js             |  6 +++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index f85b1ea2f..e13cf8a95 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -28,13 +28,17 @@ jobs:
     - run: yarn build
     - run: yarn build-pro
 
-    # - name: Configure GPG Key
-    #   run: |
-    #     gpg --no-tty --batch --yes --import <(echo "$GPG_SIGNING_KEY")
-    #     for ff in `ls ./build/dist/releases/**/**/*.zip | xargs`; do gpg --detach-sign --no-tty --yes --armor --openpgp -u 87DA4591 --passphrase $GPG_PASSPHRASE $ff; done
-    #   env:
-    #     GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
-    #     GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+    - name: Configure GPG Key
+      run: |
+        cat <(echo -e "${{ secrets.GPG_SIGNING_KEY }}") | gpg --batch --import --no-tty --yes
+        for ff in `ls ./build/dist/releases/**/**/*.zip | xargs`; do gpg --detach-sign --no-tty --yes --armor --openpgp -u 87DA4591 --passphrase $GPG_PASSPHRASE $ff; done
+      env:
+        GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
+    - name: Move all assets to release folder
+      run: |
+        mkdir ./release
+        cp `ls ./build/dist/releases/**/**/*.zip | xargs` ./release
 
     - name: Create Release
       id: create_release
@@ -51,4 +55,4 @@ jobs:
       uses: shogo82148/actions-upload-release-asset@v1
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./build/dist/releases/*
+        asset_path: ./release/*
diff --git a/tasks/config.js b/tasks/config.js
index bea665628..b03841cc1 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -20,7 +20,7 @@ const config = {
 	cleanPath: '',
 	zipSrcPath: '',
 	zipFile: '',
-	zipFileShort: '',
+	// zipFileShort: '',
 
 	paths: {}
 };
diff --git a/tasks/rainloop.js b/tasks/rainloop.js
index e540593ae..814882a8e 100644
--- a/tasks/rainloop.js
+++ b/tasks/rainloop.js
@@ -48,7 +48,7 @@ const rainloopSetup = (done) => {
 	config.cleanPath = dist;
 	config.zipSrcPath = dist;
 	config.zipFile = 'rainloop-' + (config.community ? 'community-' : '') + versionFull + '.zip';
-	config.zipFileShort = 'rainloop-' + (config.community ? 'community-' : '') + 'latest.zip';
+	// config.zipFileShort = 'rainloop-' + (config.community ? 'community-' : '') + 'latest.zip';
 
 	config.rainloopBuilded = true;
 
@@ -71,8 +71,8 @@ const rainloopClean = (done) => {
 	done();
 };
 
-const rainloopShortName = (done) => copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done);
+// const rainloopShortName = (done) => copy(config.destPath + config.zipFile, config.destPath + config.zipFileShort, done);
 
 exports.rainloopBuild = gulp.series(rainloopCopy, rainloopSetup);
 
-exports.rainloop = gulp.series(exports.rainloopBuild, rainloopZip, rainloopClean, rainloopShortName);
+exports.rainloop = gulp.series(exports.rainloopBuild, rainloopZip, rainloopClean /*, rainloopShortName*/);