From a3a23065c79058876a78eb292323598ab0c00bf9 Mon Sep 17 00:00:00 2001 From: Timeraa Date: Sun, 21 Feb 2021 01:01:34 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=9E=20I=20guess=20this=20works=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 24 ++++++++++++------------ util/uploadFile.ts | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 326e36e..e5b0376 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,9 +26,9 @@ jobs: node util/zip dist ${{ matrix.os }}.zip --zip - name: Upload bundle env: - SSHHOST: ${{ secrets.SSHHOST }} - SSHUSERNAME: ${{ secrets.SSHUSERNAME }} - SSHPASSWORD: ${{ secrets.SSHPASSWORD }} + SSHHOST: ${{ secrets.MAIN_HOST }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + SSHKEY: ${{ secrets.SSH_KEY }} run: | tsc util/uploadFile util/zip node util/uploadFile ${{ matrix.os }}.zip /home/PreMiD/download/util/${{ matrix.os }}.zip @@ -44,11 +44,11 @@ jobs: sudo npm i -g typescript - name: Download InstallBuilder run: | - wget https://clients.bitrock.com/installbuilder/installbuilder-enterprise-20.7.0-linux-x64-installer.run - chmod u+x installbuilder-enterprise-20.7.0-linux-x64-installer.run + wget https://clients.bitrock.com/installbuilder/installbuilder-enterprise-20.12.0-linux-x64-installer.run + chmod u+x installbuilder-enterprise-20.12.0-linux-x64-installer.run - name: Install InstallBuilder run: | - ./installbuilder-enterprise-20.7.0-linux-x64-installer.run --installer-language en --prefix ./installbuilder --mode unattended + ./installbuilder-enterprise-20.12.0-linux-x64-installer.run --installer-language en --prefix ./installbuilder --mode unattended echo "${{ secrets.IBLICENSE }}" > ./installbuilder/license.xml - name: Prepare Upgrade Installer run: | @@ -62,9 +62,9 @@ jobs: installbuilder/bin/builder build installer_assets/PreMiD-Upgrade.xml windows - name: Upload files env: - SSHHOST: ${{ secrets.SSHHOST }} - SSHUSERNAME: ${{ secrets.SSHUSERNAME }} - SSHPASSWORD: ${{ secrets.SSHPASSWORD }} + SSHHOST: ${{ secrets.MAIN_HOST }} + SSH_USERNAME: ${{ secrets.SSH_USERNAME }} + SSHKEY: ${{ secrets.SSH_KEY }} run: | tsc util/uploadFile util/zip node util/uploadFile dist/installer/upgrader.exe /home/PreMiD/download/upgrader.exe @@ -72,9 +72,9 @@ jobs: - name: Finalize build uses: appleboy/ssh-action@master with: - host: ${{ secrets.SSHHOST }} - username: ${{ secrets.SSHUSERNAME }} - password: ${{ secrets.SSHPASSWORD }} + host: ${{ secrets.MAIN_HOST }} + username: ${{ secrets.SSH_USERNAME }} + key: ${{ secrets.SSH_KEY }} script: | cd /home/PreMiD/download/util unzip upgrader.app.zip diff --git a/util/uploadFile.ts b/util/uploadFile.ts index 3045420..74e39a0 100644 --- a/util/uploadFile.ts +++ b/util/uploadFile.ts @@ -5,8 +5,8 @@ let sftp = new Client(); sftp .connect({ host: process.env.SSHHOST, - username: process.env.SSHUSERNAME, - password: process.env.SSHPASSWORD + username: process.env.SSH_USERNAME, + privateKey: process.env.SSH_KEY }) .then(async () => { sftp