Compare commits

...

4 commits

Author SHA1 Message Date
smartfrigde
e21ec96090 Fix clipboard bug 2022-05-21 12:58:52 +02:00
smartfrigde
92beb1c8f1 v3.0.6 2022-05-14 23:45:30 +02:00
smartfrigde
1251733d24 Add release workflow 2022-05-14 23:43:01 +02:00
smartfridge
407d0eb075
Update utils.ts 2022-05-14 23:36:25 +02:00
4 changed files with 48 additions and 8 deletions

40
.github/workflows/build.yml vendored Normal file
View file

@ -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/**

10
package-lock.json generated
View file

@ -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",

View file

@ -1,6 +1,6 @@
{
"name": "ArmCord",
"version": "3.1.0",
"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": {
@ -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"
},

View file

@ -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();