aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-05-13 21:15:28 +0530
committerLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-05-15 14:13:49 +0530
commit112f3f3daf56dcc1f7e446a84ad0bed9a0c8d7b7 (patch)
tree14e2b98a6bdca690130127170c8b39be62dfcd70
parentFixing the broken build process when building using the Dockerfile. (diff)
downloadferdium-app-112f3f3daf56dcc1f7e446a84ad0bed9a0c8d7b7.tar.gz
ferdium-app-112f3f3daf56dcc1f7e446a84ad0bed9a0c8d7b7.tar.zst
ferdium-app-112f3f3daf56dcc1f7e446a84ad0bed9a0c8d7b7.zip
Minor refactoring to have consistent command-line invocations.
-rw-r--r--.travis.yml6
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--appveyor.yml2
-rw-r--r--gulpfile.babel.js2
4 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index b87e47c02..e09c1f08a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,9 +58,9 @@ before_install:
58 fi 58 fi
59install: 59install:
60 - npm cache clean -f || travis_terminate 1 60 - npm cache clean -f || travis_terminate 1
61 - npm uninstall node-gyp && travis_retry npm install -g node-gyp@8.0.0 || travis_terminate 1 61 - travis_retry npm uninstall node-gyp node-sass || travis_terminate 1
62 - npm uninstall node-sass && travis_retry npm install -g node-sass@5.0.0 || travis_terminate 1 62 - travis_retry npm i -g node-gyp@8.0.0 node-sass@5.0.0 || travis_terminate 1
63 - cd recipes && npm install && npm run package && cd .. || travis_terminate 1 63 - cd recipes && npm i && npm run package && cd .. || travis_terminate 1
64 - travis_retry npx lerna bootstrap || travis_terminate 1 64 - travis_retry npx lerna bootstrap || travis_terminate 1
65before_script: 65before_script:
66 - npm run lint && npm run test || travis_terminate 1 66 - npm run lint && npm run test || travis_terminate 1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efcc4eac3..d4a3ef02c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -85,7 +85,7 @@ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel rpm
85Please make sure you run this command as an administrator: 85Please make sure you run this command as an administrator:
86 86
87```bash 87```bash
88npm install --global windows-build-tools --vs2015 88npm i -g windows-build-tools --vs2015
89``` 89```
90 90
91### Clone repository with submodule 91### Clone repository with submodule
@@ -101,6 +101,7 @@ It is important you execute the last command to get the required submodules (rec
101### Local caching of dependencies 101### Local caching of dependencies
102 102
103Set these env vars into your profile (or if you use [direnv](https://direnv.net/), you can manage them via the respective `.envrc` file) 103Set these env vars into your profile (or if you use [direnv](https://direnv.net/), you can manage them via the respective `.envrc` file)
104
104```bash 105```bash
105export ELECTRON_CACHE=$HOME/.cache/electron 106export ELECTRON_CACHE=$HOME/.cache/electron
106export ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder 107export ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
@@ -127,8 +128,7 @@ npm run rebuild
127Ferdi requires its recipes to be packaged before it can use it. When running Ferdi as a development instance, you'll need to package the local recipes before you can create any services inside Ferdi. 128Ferdi requires its recipes to be packaged before it can use it. When running Ferdi as a development instance, you'll need to package the local recipes before you can create any services inside Ferdi.
128 129
129```bash 130```bash
130cd recipes 131cd recipes && npm i && npm run package
131npm install && npm run package
132``` 132```
133 133
134### Using Docker to build an rpm package 134### Using Docker to build an rpm package
diff --git a/appveyor.yml b/appveyor.yml
index da1ea0e61..7fd061523 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,7 +22,7 @@ install:
22 - appveyor-retry git submodule update --init --recursive 22 - appveyor-retry git submodule update --init --recursive
23 - ps: Update-NodeJsInstallation $env:nodejs_version 23 - ps: Update-NodeJsInstallation $env:nodejs_version
24 - cmd: set NODE_OPTIONS=--max-old-space-size=2048 24 - cmd: set NODE_OPTIONS=--max-old-space-size=2048
25 - cd recipes && npm install && npm run package && cd .. 25 - cd recipes && npm i && npm run package && cd ..
26 - appveyor-retry npx lerna bootstrap 26 - appveyor-retry npx lerna bootstrap
27 27
28before_build: 28before_build:
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 407bd3b31..9a04732b7 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -15,10 +15,10 @@ import { removeSync, outputJson } from 'fs-extra';
15import kebabCase from 'kebab-case'; 15import kebabCase from 'kebab-case';
16import hexRgb from 'hex-rgb'; 16import hexRgb from 'hex-rgb';
17 17
18import * as buildInfo from 'preval-build-info';
18import config from './package.json'; 19import config from './package.json';
19 20
20import * as rawStyleConfig from './src/theme/default/legacy.js'; 21import * as rawStyleConfig from './src/theme/default/legacy.js';
21import * as buildInfo from 'preval-build-info';
22 22
23dotenv.config(); 23dotenv.config();
24 24