Compare commits

..

4 commits

Author SHA1 Message Date
smartfridge
095a060be5
Update README.md 2022-04-19 22:45:01 +02:00
dependabot[bot]
07d5cd15d0
Bump @types/node from 17.0.24 to 17.0.25 (#96)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.24 to 17.0.25.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-19 22:45:01 +02:00
dependabot[bot]
9599013977
Bump electron-builder from 22.5.1 to 23.0.3 (#95)
Bumps [electron-builder](https://github.com/electron-userland/electron-builder/tree/HEAD/packages/electron-builder) from 22.5.1 to 23.0.3.
- [Release notes](https://github.com/electron-userland/electron-builder/releases)
- [Changelog](https://github.com/electron-userland/electron-builder/blob/master/packages/electron-builder/CHANGELOG.md)
- [Commits](https://github.com/electron-userland/electron-builder/commits/v23.0.3/packages/electron-builder)

---
updated-dependencies:
- dependency-name: electron-builder
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-19 22:45:00 +02:00
smartfrigde
be6364cdfa
Add dev build CI 2022-04-19 22:44:05 +02:00
4 changed files with 2004 additions and 1021 deletions

View file

@ -1,59 +1,135 @@
name: Dev build name: Dev build
on: [push] on: [push]
env:
FORCE_COLOR: true
jobs: jobs:
build: build-linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3 steps:
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '18' node-version: '18'
- run: sudo apt install -y wine
- run: npm install - name: Checkout code
- run: npm run CIbuild uses: actions/checkout@v2
- id: vars
shell: bash - name: Install Node dependencies
run: | run: npm install
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Create Release - name: Install Electron-Builder
id: create_release run: npm install -g electron-builder
uses: actions/create-release@v1
env: - name: Build
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: npm run build && electron-builder --linux zip
with:
tag_name: ${{ steps.vars.outputs.sha_short }} - name: Upload artifact
release_name: Release ${{ steps.vars.outputs.sha_short }} uses: actions/upload-artifact@v2
draft: true with:
prerelease: true name: ArmCordLinux.zip
body_path: ./.github/release.md path: dist/ArmCord-3.1.0.zip
- uses: actions/upload-release-asset@v1
env: build-mac:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: macos-latest
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} steps:
asset_path: /home/runner/work/ArmCord/ArmCord/dist/ArmCord-3.1.0.zip - uses: actions/setup-node@v3
asset_name: ArmCordLinux.zip with:
asset_content_type: application/octet-stream node-version: '18'
- uses: actions/upload-release-asset@v1
env: - name: Checkout code
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} uses: actions/checkout@v2
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} - name: Install Node dependencies
asset_path: /home/runner/work/ArmCord/ArmCord/dist/ArmCord-3.1.0-win.zip run: npm install
asset_name: ArmCordWindows.zip
asset_content_type: application/octet-stream - name: Install Electron-Builder
- uses: actions/upload-release-asset@v1 run: npm install -g electron-builder
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build
with: run: npm run build && electron-builder --macos zip
upload_url: ${{ steps.create_release.outputs.upload_url }} env:
asset_path: /home/runner/work/ArmCord/ArmCord/dist/ArmCord-3.1.0-mac.zip GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
asset_name: ArmCordWindows.zip
asset_content_type: application/octet-stream - name: Upload artifact
- run: | uses: actions/upload-artifact@v2
curl --request PATCH \ with:
-H "Accept: application/vnd.github.v3+json" \ name: ArmCordMac.zip
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ path: dist/ArmCord-3.1.0-mac.zip
-H "Content-Type: application/json" \
https://api.github.com/repos/${{ github.repository }}/releases/${{steps.create_release.outputs.id}} \ build-windows:
-d '{"draft":false}' runs-on: windows-latest
steps:
- uses: actions/setup-node@v3
with:
node-version: '18'
- name: Checkout code
uses: actions/checkout@v2
- name: Install Node dependencies
run: npm install
- name: Install Electron-Builder
run: npm install -g electron-builder
- name: Build
run: npm run build && electron-builder --windows zip
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: ArmCordWindows.zip
path: dist/ArmCord-3.1.0-win.zip
release:
runs-on: ubuntu-latest
needs: [build-linux, build-mac, build-windows]
steps:
- name: Checkout code
uses: actions/checkout@v2
- uses: actions/download-artifact@v2
with:
name: ArmCordMac.zip
path: macos
- uses: actions/download-artifact@v2
with:
name: ArmCordWindows.zip
path: windows
- uses: actions/download-artifact@v2
with:
name: ArmCordLinux.zip
path: linux
- run: |
ls
ls windows
ls macos
ls linux
- name: Get some values needed for the release
id: vars
shell: bash
run: |
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Create the release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.vars.outputs.sha_short }}
name: Dev Build ${{ steps.vars.outputs.sha_short }}
draft: false
prerelease: true
body_path: .github/release.md
files: |
linux/ArmCord-3.1.0.zip
macos/ArmCord-3.1.0-mac.zip
windows/ArmCord-3.1.0-win.zip

View file

@ -57,7 +57,7 @@ Install it via an AUR helper tool like `yay`.
-We are using official web app and adding some magic powder to make it all work! -We are using official web app and adding some magic powder to make it all work!
## 3. Can I use this on other architectures or operating systems? ## 3. Can I use this on other architectures or operating systems?
-Yes! ArmCord should work normally under Windows, ~~Mac OS~~ (Mac OS is broken see [#48](https://github.com/ArmCord/ArmCord/issues/48)) and Linux as long as it has NodeJS, npm and Electron support. -Yes! ArmCord should work normally under Windows, Mac OS and Linux as long as it has NodeJS, npm and Electron support.
# Credits # Credits
[ArmCord UI Elements and few features](https://github.com/kckarnige) [ArmCord UI Elements and few features](https://github.com/kckarnige)

2831
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -24,11 +24,11 @@
"homepage": "https://github.com/armcord/armcord#readme", "homepage": "https://github.com/armcord/armcord#readme",
"devDependencies": { "devDependencies": {
"@types/electron-json-storage": "^4.5.0", "@types/electron-json-storage": "^4.5.0",
"@types/node": "^17.0.24", "@types/node": "^17.0.25",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
"copyfiles": "^2.4.1", "copyfiles": "^2.4.1",
"electron": "^18.0.4", "electron": "^18.0.4",
"electron-builder": "^22.5.1", "electron-builder": "^23.0.3",
"husky": "^7.0.4", "husky": "^7.0.4",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"typescript": "^4.5.4" "typescript": "^4.5.4"