Skip to content

Commit

Permalink
Merge branch 'feature/build-for-macos' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
vti committed Sep 22, 2022
2 parents c115bd4 + d907d40 commit 87026c6
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 2 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,28 @@ jobs:
path: |
out/make/zip/linux/x64/*zip
if-no-files-found: error
macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
cache: 'yarn'
- run: yarn install
- run: yarn test
- run: yarn make
- name: get version
run: |
VERSION="$(node -p "require('./package.json').version")"
echo "::set-output name=VERSION::$VERSION"
id: version
- uses: actions/upload-artifact@v3
with:
name: elemntary-macos-${{ steps.version.outputs.VERSION }}-bundle
path: |
out/make/zip/darwin/x64/*zip
if-no-files-found: error
windows:
runs-on: windows-latest
steps:
Expand Down
34 changes: 32 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ insights and hidden features.

The easiest way to install it is to download a pre-built release zip-file for your Operating System:

- [Windows](https://github.com/vti/elemntary/releases/download/v0.4.2/elemntary-win32-x64-0.4.2.zip)
- MacOS
- [Windows](https://github.com/vti/elemntary/releases/download/v0.4.2/elemntary-win32-x64-0.4.2.zip) (application is not signed, you might need to add a security exception)
- [MacOS](https://github.com/vti/elemntary/releases/download/v0.4.2/elemntary-darwin-x64-0.4.2.zip) (application is not signed, you might need to add a security exception)
- [Linux](https://github.com/vti/elemntary/releases/download/v0.4.2/elemntary-linux-x64-0.4.2.zip)

## Usage
Expand All @@ -44,6 +44,25 @@ depends on the model. Follow the instructions:

This is an Electron app, so JavaScript/Node knowledge is required.

### Environment

You need to have the following software to be installed:

- `node` (>= v16)
- `yarn` (or use `npm`)

NodeJS can be downloaded and installed for your operation system from the [official NodeJS downloads
page](https://nodejs.org/en/download/).

Yarn is optional and can be installed by following [their guide](https://yarnpkg.com/getting-started/install).

For MacOS it is also possible to use `brew`:

```bash
$ brew install node
$ brew install yarn
```

### Building

```bash
Expand Down Expand Up @@ -71,3 +90,14 @@ This project is standing on the shoulders of the giants:
[@Intyre](https://github.com/Intyre) for reverse engineering

[@treee111](https://github.com/treee111) for [wahooMapsCreator](https://github.com/treee111/wahooMapsCreator)

## Author

Viacheslav Tykhanovskyi (vti AT uptosmth.com)

## Copyright and License

Copyright (C) 2022, Viacheslav Tykhanovskyi

This program is free software, you can redistribute it and/or modify it under the terms of the GNU GENERAL PUBLIC
LICENSE v3 or later. See LICENSE file for details.
Binary file added contrib/adb/darwin/adb
Binary file not shown.
4 changes: 4 additions & 0 deletions src/electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ const {
dialog,
} = require("electron");

if (app.getGPUFeatureStatus().gpu_compositing.includes("disabled")) {
app.disableHardwareAcceleration();
}

const contextMenu = require("electron-context-menu");

const AdbWrapper = require("../domain/adb-wrapper.js");
Expand Down

0 comments on commit 87026c6

Please sign in to comment.