diff options
author | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-03 17:15:16 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-03 11:45:16 +0000 |
commit | e1ab7202cd678ca986f7aeb95861709be59e0a2e (patch) | |
tree | 57e648a71f37a2203f2598fa66dc1efc5a2703ff | |
parent | New Crowdin updates (#1336) (diff) | |
download | ferdium-app-e1ab7202cd678ca986f7aeb95861709be59e0a2e.tar.gz ferdium-app-e1ab7202cd678ca986f7aeb95861709be59e0a2e.tar.zst ferdium-app-e1ab7202cd678ca986f7aeb95861709be59e0a2e.zip |
Added more logging for CI builds to debug errors (#1329)
-rw-r--r-- | .travis.yml | 15 | ||||
-rw-r--r-- | gulpfile.babel.js | 8 | ||||
-rw-r--r-- | package.json | 4 |
3 files changed, 18 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 0d818e995..b7cd25117 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -16,6 +16,8 @@ matrix: | |||
16 | osx_image: xcode12 | 16 | osx_image: xcode12 |
17 | 17 | ||
18 | language: node_js | 18 | language: node_js |
19 | node_js: | ||
20 | - 14 | ||
19 | git: | 21 | git: |
20 | submodules: false | 22 | submodules: false |
21 | branches: | 23 | branches: |
@@ -33,15 +35,18 @@ before_install: | |||
33 | git fetch source | 35 | git fetch source |
34 | git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop | 36 | git merge --no-ff --commit -m "Merge remote-tracking branch 'source/develop' into HEAD [skip ci]" source/develop |
35 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) | 37 | CHANGES_COUNT=$(git diff --stat HEAD origin/nightly | wc -l) |
36 | echo $TRAVIS_EVENT_TYPE | 38 | echo "Travis event type: $TRAVIS_EVENT_TYPE" |
37 | echo $changes | 39 | echo "Number of changes: $CHANGES_COUNT" |
38 | if [ $CHANGES_COUNT -eq 0 -a $TRAVIS_EVENT_TYPE == "cron" ]; then | 40 | if [ $CHANGES_COUNT -eq 0 -a $TRAVIS_EVENT_TYPE == "cron" ]; then |
39 | travis_terminate 0; | 41 | echo "Terminating the build since there are no changes in a cron-triggered build" |
42 | travis_terminate 0 | ||
40 | else | 43 | else |
44 | echo "Found changes, proceeding with submodule updates" | ||
41 | git submodule update --remote --force | 45 | git submodule update --remote --force |
42 | git add . | 46 | git add . |
43 | git commit -m "Update submodules [skip ci]" || true | 47 | git commit -m "Update submodules [skip ci]" || true |
44 | fi | 48 | fi |
49 | echo "Completed merging from develop branch and upgrading submodules" | ||
45 | fi | 50 | fi |
46 | install: | 51 | install: |
47 | - cd recipes && npm install && npm run package && cd .. | 52 | - cd recipes && npm install && npm run package && cd .. |
@@ -52,7 +57,7 @@ before_script: | |||
52 | script: | 57 | script: |
53 | - | | 58 | - | |
54 | if [ $TRAVIS_BRANCH == "release" ]; then | 59 | if [ $TRAVIS_BRANCH == "release" ]; then |
55 | echo "Building..." | 60 | echo "Building for release..." |
56 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi -c.mac.identity=null | 61 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=ferdi -c.mac.identity=null |
57 | fi | 62 | fi |
58 | - | | 63 | - | |
@@ -60,7 +65,7 @@ script: | |||
60 | git add . | 65 | git add . |
61 | git commit -m "Apply linter fixes [skip ci]" | 66 | git commit -m "Apply linter fixes [skip ci]" |
62 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" | 67 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" |
63 | echo "Building..." | 68 | echo "Building for nightly..." |
64 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies | 69 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies |
65 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 70 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
66 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 71 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 6a788a9ae..782b56406 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js | |||
@@ -11,10 +11,9 @@ import connect from 'gulp-connect'; | |||
11 | import { exec } from 'child_process'; | 11 | import { exec } from 'child_process'; |
12 | import dotenv from 'dotenv'; | 12 | import dotenv from 'dotenv'; |
13 | import sassVariables from 'gulp-sass-variables'; | 13 | import sassVariables from 'gulp-sass-variables'; |
14 | import { moveSync, removeSync } from 'fs-extra'; | 14 | import { removeSync } from 'fs-extra'; |
15 | import kebabCase from 'kebab-case'; | 15 | import kebabCase from 'kebab-case'; |
16 | import hexRgb from 'hex-rgb'; | 16 | import hexRgb from 'hex-rgb'; |
17 | import path from 'path'; | ||
18 | 17 | ||
19 | import config from './package.json'; | 18 | import config from './package.json'; |
20 | 19 | ||
@@ -80,6 +79,7 @@ const paths = { | |||
80 | }, | 79 | }, |
81 | }; | 80 | }; |
82 | 81 | ||
82 | // eslint-disable-next-line no-unused-vars | ||
83 | function _shell(cmd, cb) { | 83 | function _shell(cmd, cb) { |
84 | console.log('executing', cmd); | 84 | console.log('executing', cmd); |
85 | exec( | 85 | exec( |
@@ -136,7 +136,7 @@ export function html() { | |||
136 | .src(paths.html.src, { since: gulp.lastRun(html) }) | 136 | .src(paths.html.src, { since: gulp.lastRun(html) }) |
137 | .pipe(gulpIf(process.env.NODE_ENV !== 'development', htmlMin({ // Only minify in production to speed up dev builds | 137 | .pipe(gulpIf(process.env.NODE_ENV !== 'development', htmlMin({ // Only minify in production to speed up dev builds |
138 | collapseWhitespace: true, | 138 | collapseWhitespace: true, |
139 | removeComments: true | 139 | removeComments: true, |
140 | }))) | 140 | }))) |
141 | .pipe(gulp.dest(paths.html.dest)) | 141 | .pipe(gulp.dest(paths.html.dest)) |
142 | .pipe(connect.reload()); | 142 | .pipe(connect.reload()); |
@@ -224,7 +224,7 @@ export function watch() { | |||
224 | export function webserver() { | 224 | export function webserver() { |
225 | connect.server({ | 225 | connect.server({ |
226 | root: paths.dest, | 226 | root: paths.dest, |
227 | livereload: true | 227 | livereload: true, |
228 | }); | 228 | }); |
229 | } | 229 | } |
230 | 230 | ||
diff --git a/package.json b/package.json index 99c6d2723..0046b57c7 100644 --- a/package.json +++ b/package.json | |||
@@ -10,6 +10,10 @@ | |||
10 | "homepage": "https://github.com/getferdi/ferdi", | 10 | "homepage": "https://github.com/getferdi/ferdi", |
11 | "repository": "https://github.com/getferdi/ferdi.git", | 11 | "repository": "https://github.com/getferdi/ferdi.git", |
12 | "private": true, | 12 | "private": true, |
13 | "engines": { | ||
14 | "node": "14.x", | ||
15 | "npm": "6.x" | ||
16 | }, | ||
13 | "scripts": { | 17 | "scripts": { |
14 | "prestart": "npm run rebuild", | 18 | "prestart": "npm run rebuild", |
15 | "start": "electron ./build", | 19 | "start": "electron ./build", |