diff options
author | Vijay A <avijayr@protonmail.com> | 2021-05-17 09:38:33 +0530 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-05-17 04:12:42 +0000 |
commit | 2066dfdd1da718484a7f7147bb336c8d9421f059 (patch) | |
tree | 380bdf895c5a52ecdb1c59d549a234277a696a26 | |
parent | Upgraded other npm modules (diff) | |
download | ferdium-app-2066dfdd1da718484a7f7147bb336c8d9421f059.tar.gz ferdium-app-2066dfdd1da718484a7f7147bb336c8d9421f059.tar.zst ferdium-app-2066dfdd1da718484a7f7147bb336c8d9421f059.zip |
Missed 'prepare' step that enforces the installation of the git pre-commit hooks
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | package.json | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 40c8ba96a..7be0f2a33 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -3,7 +3,6 @@ node_modules | |||
3 | flow-typed | 3 | flow-typed |
4 | out | 4 | out |
5 | .DS_Store | 5 | .DS_Store |
6 | .idea | ||
7 | build | 6 | build |
8 | .tmp | 7 | .tmp |
9 | .stage | 8 | .stage |
diff --git a/.travis.yml b/.travis.yml index a52edcff5..2495cb229 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -52,7 +52,7 @@ before_install: | |||
52 | else | 52 | else |
53 | echo "Found changes, proceeding with submodule updates" | 53 | echo "Found changes, proceeding with submodule updates" |
54 | git submodule update --remote --force | 54 | git submodule update --remote --force |
55 | git commit -am "Update submodules [skip ci]" || true | 55 | git commit -am "Update submodules [skip ci]" --no-verify || true |
56 | fi | 56 | fi |
57 | echo "Completed merging from develop branch and upgrading submodules" | 57 | echo "Completed merging from develop branch and upgrading submodules" |
58 | fi | 58 | fi |
@@ -70,12 +70,12 @@ script: | |||
70 | if [ $TRAVIS_BRANCH == "release" ]; then | 70 | if [ $TRAVIS_BRANCH == "release" ]; then |
71 | 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 || travis_terminate 1 | 71 | 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 || travis_terminate 1 |
72 | elif [ $TRAVIS_BRANCH == "nightly" ]; then | 72 | elif [ $TRAVIS_BRANCH == "nightly" ]; then |
73 | git commit -am "Apply linter fixes [skip ci]" | 73 | git commit -am "Apply linter fixes [skip ci]" --no-verify |
74 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip ci]" || travis_terminate 1 | 74 | npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip ci]" || travis_terminate 1 |
75 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies || travis_terminate 1 | 75 | travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies || travis_terminate 1 |
76 | if [ $TRAVIS_OS_NAME == "osx" ]; then | 76 | if [ $TRAVIS_OS_NAME == "osx" ]; then |
77 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 | 77 | git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 |
78 | git push -qu nightly HEAD:nightly >/dev/null 2>&1 | 78 | git push -qu nightly HEAD:nightly --no-verify >/dev/null 2>&1 |
79 | fi | 79 | fi |
80 | else | 80 | else |
81 | if [ $TRAVIS_PULL_REQUEST_BRANCH != "i18n" ]; then | 81 | if [ $TRAVIS_PULL_REQUEST_BRANCH != "i18n" ]; then |
diff --git a/package.json b/package.json index b3bd67722..386a6f978 100644 --- a/package.json +++ b/package.json | |||
@@ -16,6 +16,7 @@ | |||
16 | "node-gyp": "^8.0" | 16 | "node-gyp": "^8.0" |
17 | }, | 17 | }, |
18 | "scripts": { | 18 | "scripts": { |
19 | "prepare": "husky install", | ||
19 | "prestart": "npm run rebuild", | 20 | "prestart": "npm run rebuild", |
20 | "start": "electron ./build", | 21 | "start": "electron ./build", |
21 | "start:local": "cross-env LOCAL_API=1 npm start", | 22 | "start:local": "cross-env LOCAL_API=1 npm start", |