Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/flow 8078 savencia #29

Merged
merged 10 commits into from
Nov 17, 2020
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -3,7 +3,6 @@ node_js: '12'
sudo: enabled
dist: trusty
before_install:
- npm i -g npm@6.4.1
- npm config set '@taktik:registry' 'https://npm.taktik.be/repository/npm/'
- npm config set '//npm.taktik.be/repository/npm/:_authToken' "${NPM_TOKEN}"
install:
Expand Down Expand Up @@ -31,5 +30,5 @@ addons:
script:
- npm run setup
- npm run lint
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then npm run compile-darwin -- --publish never;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] ; then travis_wait 20 npm run compile-darwin -- --publish never;fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then npm run compile-linux ;fi
8 changes: 6 additions & 2 deletions README.md
Expand Up @@ -31,11 +31,15 @@ Firstly, run this command to install all needed dependencies. If you have encoun
$ npm run setup
```

The given command below will run flowr-desktop in the development mode.
The given command below will serve renderer files in the development mode.

```bash
$ npm run dev
```
and in another terminal
```bash
$ npm start
```

## Other commands

Expand All @@ -60,7 +64,7 @@ $ npm run <command>
| `lint` | Lints code. |
| `lint-fix` | Fixes eslint errors if any |
| `start` | Starts flowr-desktop. |
| `dev` | Starts flowr-desktop in the development mode |
| `dev` | Build and serves project in the development mode |

#### Known issues

Expand Down
44 changes: 44 additions & 0 deletions electron-builder.common.js
@@ -0,0 +1,44 @@
module.exports = {
appId: 'org.taktik.flowr.pcClient',
productName: 'flowr-desktop',
artifactName: '${productName}-${version}.${ext}',
nsis: {
include: 'static/installer.nsh',
oneClick: false,
allowToChangeInstallationDirectory: true
},

asar: false,
directories: {
output: 'dist',
buildResources: 'static/app-icons'
},
files: ['build/**/*', 'package.json'],
linux: {
category: 'Network',
target: [
{
target: 'deb',
arch: ['x64']
}
]
},
deb: {
depends: ['ffmpeg']
},
win: {
target: [
{
target: 'zip',
arch: ['x64', 'ia32']
},
{
target: 'nsis',
arch: ['x64', 'ia32']
}
]
},
mac: {
category: 'public.app-category.navigation'
}
}
47 changes: 0 additions & 47 deletions electron-builder.json

This file was deleted.

9 changes: 9 additions & 0 deletions electron-builder.widevine.js
@@ -0,0 +1,9 @@
const common = require('./electron-builder.common')

module.exports = {
...common,
artifactName: '${productName}-${version}-widevine.${ext}',
electronDownload: {
mirror: 'https://github.com/castlabs/electron-releases/releases/download/v'
}
}