From 847cb9c2c8db8e5da5f5ed23236aedb99c531ce8 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 30 Jun 2021 15:40:19 +0200 Subject: [PATCH] Plugin install warning + fixed workflows? --- .github/workflows/build.yml | 61 ++++++++++++++++--------------------- utils/plugin.js | 8 ++++- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c201a7..22a68fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,39 +1,32 @@ -name: Build -on: [push, pull_request] +name: Build/release + +on: push jobs: - build_on_linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@master - with: - node-version: 14 - - name: install dependencies - run: npm install - - name: build - run: npm run make + release: + runs-on: ${{ matrix.os }} - build_on_mac: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@master - with: - node-version: 14 - - name: install dependencies - run: npm install - - name: build - run: npm run make + strategy: + matrix: + os: [macos-latest, ubuntu-latest, windows-latest] - build_on_win: - runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@master - with: - node-version: 14 - - name: install dependencies - run: npm install - - name: build - run: npm run make + - name: Check out Git repository + uses: actions/checkout@v1 + + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v1 + with: + node-version: 16 + + - name: Build/release Electron app + uses: samuelmeuli/action-electron-builder@v1 + with: + # GitHub token, automatically provided to the action + # (No need to define this secret in the repo settings) + github_token: ${{ secrets.github_token }} + # skip npm run build as there's no script like that + skip_build: true + # If the commit is tagged with a version (e.g. "v1.0.0"), + # release the app after building + release: ${{ startsWith(github.ref, 'refs/tags/v') }} \ No newline at end of file diff --git a/utils/plugin.js b/utils/plugin.js index 2049a67..46997e0 100644 --- a/utils/plugin.js +++ b/utils/plugin.js @@ -34,7 +34,13 @@ if (!fs.existsSync(pluginFolder)) { console.log("Downloaded, attempting to install."); const unzip = require("unzipper") fs.createReadStream(dest).pipe(unzip.Extract({ path: pluginFolder })); - console.log("Success! GooseMod will start on next session!") + electron.dialog.showMessageBox({ + title: "ArmCord", + type: "warning", + message: "ArmCord installed GooseMod onto your client.", + detail: + "If you wish to use it restart your ArmCord completely using tray icon. It should appear in next session. GooseMod is reccomended to every user of ArmCord due to various improvements and bugfixes it ships with.", + }); }); } catch (e){