From 407d0eb07581004f37e8050285d83cf3f9d8beae Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 14 May 2022 23:36:25 +0200 Subject: [PATCH 1/4] Update utils.ts --- src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.ts b/src/utils.ts index 9144b12..3884ca9 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -52,7 +52,7 @@ export function setup() { export function getVersion() { //to-do better way of doing this - return "3.1.0"; + return "3.0.6"; } export async function injectJS(inject: string) { const js = await (await fetch(`${inject}`)).text(); From 1251733d24d7f7118f3f46fe5798fa781dc50baa Mon Sep 17 00:00:00 2001 From: smartfrigde <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 14 May 2022 23:43:01 +0200 Subject: [PATCH 2/4] Add release workflow --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5cd1a2a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +name: Build/release + +on: + push: + branches: + - stable + +jobs: + release: + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [macos-latest, ubuntu-latest, windows-latest] + + steps: + - 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: false + # 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') }} #disabled for now as it caused problems (nvm) + - name: Archive production builds + uses: actions/upload-artifact@v2 + with: + name: dist folder + path: dist/** \ No newline at end of file diff --git a/package.json b/package.json index 48bde48..304d600 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ArmCord", - "version": "3.1.0", + "version": "3.0.5", "description": "ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight.", "main": "ts-out/main.js", "scripts": { From 92beb1c8f1255aa92f25f36838d962ddb2dd24e9 Mon Sep 17 00:00:00 2001 From: smartfrigde <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 14 May 2022 23:45:30 +0200 Subject: [PATCH 3/4] v3.0.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 304d600..10d9d4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ArmCord", - "version": "3.0.5", + "version": "3.0.6", "description": "ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight.", "main": "ts-out/main.js", "scripts": { From e21ec96090556bdd1da80eb8d45dd1a8515e91e5 Mon Sep 17 00:00:00 2001 From: smartfrigde <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 21 May 2022 12:58:52 +0200 Subject: [PATCH 4/4] Fix clipboard bug --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ace2d17..1d6ac48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "ArmCord", - "version": "3.1.0", + "version": "3.0.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ArmCord", - "version": "3.1.0", + "version": "3.0.6", "hasInstallScript": true, "license": "OSL-3.0", "dependencies": { - "electron-context-menu": "https://github.com/ArmCord/electron-context-menu.git", + "electron-context-menu": "github:ArmCord/electron-context-menu", "v8-compile-cache": "^2.3.0", "ws": "^8.6.0" }, @@ -1427,7 +1427,7 @@ }, "node_modules/electron-context-menu": { "version": "3.1.2", - "resolved": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#1ec9d1e69c41f44530e2637fbe5f7d99f78b1eeb", + "resolved": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#0c6908932474213fc4ea62ff38648e68fd4a7383", "license": "MIT", "dependencies": { "cli-truncate": "^2.1.0", @@ -4661,7 +4661,7 @@ } }, "electron-context-menu": { - "version": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#1ec9d1e69c41f44530e2637fbe5f7d99f78b1eeb", + "version": "git+ssh://git@github.com/ArmCord/electron-context-menu.git#0c6908932474213fc4ea62ff38648e68fd4a7383", "from": "electron-context-menu@https://github.com/ArmCord/electron-context-menu.git", "requires": { "cli-truncate": "^2.1.0", diff --git a/package.json b/package.json index 10d9d4b..8c089c7 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "typescript": "^4.6.3" }, "dependencies": { - "electron-context-menu": "https://github.com/ArmCord/electron-context-menu.git", + "electron-context-menu": "github:ArmCord/electron-context-menu", "v8-compile-cache": "^2.3.0", "ws": "^8.6.0" },