diff options
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | package-lock.json | 19 | ||||
m--------- | recipes | 0 | ||||
m--------- | src/internal-server | 0 |
4 files changed, 14 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 285320492..923685bdc 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -15,7 +15,7 @@ matrix: | |||
15 | - ELECTRON_CACHE=$HOME/.cache/electron | 15 | - ELECTRON_CACHE=$HOME/.cache/electron |
16 | - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder | 16 | - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder |
17 | - os: osx | 17 | - os: osx |
18 | osx_image: xcode12.2 | 18 | osx_image: xcode12.4 |
19 | env: | 19 | env: |
20 | - ELECTRON_CACHE=$HOME/.cache/electron | 20 | - ELECTRON_CACHE=$HOME/.cache/electron |
21 | - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder | 21 | - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder |
@@ -57,9 +57,11 @@ before_install: | |||
57 | echo "Completed merging from develop branch and upgrading submodules" | 57 | echo "Completed merging from develop branch and upgrading submodules" |
58 | fi | 58 | fi |
59 | install: | 59 | install: |
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 | ||
62 | - npm uninstall node-sass && travis_retry npm install -g node-sass@5.0.0 || travis_terminate 1 | ||
60 | - cd recipes && npm install && npm run package && cd .. || travis_terminate 1 | 63 | - cd recipes && npm install && npm run package && cd .. || travis_terminate 1 |
61 | - travis_retry npx lerna bootstrap || travis_terminate 1 | 64 | - travis_retry npx lerna bootstrap || travis_terminate 1 |
62 | - travis_retry npm install node-sass -g || travis_terminate 1 | ||
63 | before_script: | 65 | before_script: |
64 | - npm run lint && npm run test || travis_terminate 1 | 66 | - npm run lint && npm run test || travis_terminate 1 |
65 | script: | 67 | script: |
diff --git a/package-lock.json b/package-lock.json index 552410496..7acfd4ee3 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -6787,6 +6787,16 @@ | |||
6787 | "macos-notification-state": "^1.1.0", | 6787 | "macos-notification-state": "^1.1.0", |
6788 | "windows-notification-state": "^1.3.0", | 6788 | "windows-notification-state": "^1.3.0", |
6789 | "windows-quiet-hours": "^1.2.2" | 6789 | "windows-quiet-hours": "^1.2.2" |
6790 | }, | ||
6791 | "dependencies": { | ||
6792 | "macos-notification-state": { | ||
6793 | "version": "1.3.5", | ||
6794 | "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.5.tgz", | ||
6795 | "integrity": "sha512-uTfue/exD5AtZnJHgjvaHCi0/MQOWigcTjKGmRmRSJz+SGdXZMM2TVAI/js8SnLILUzoA3FW1wveaPZne9x/Tg==", | ||
6796 | "requires": { | ||
6797 | "bindings": "^1.5.0" | ||
6798 | } | ||
6799 | } | ||
6790 | } | 6800 | } |
6791 | }, | 6801 | }, |
6792 | "@meetfranz/forms": { | 6802 | "@meetfranz/forms": { |
@@ -24626,15 +24636,6 @@ | |||
24626 | } | 24636 | } |
24627 | } | 24637 | } |
24628 | }, | 24638 | }, |
24629 | "macos-notification-state": { | ||
24630 | "version": "1.3.1", | ||
24631 | "resolved": "https://registry.npmjs.org/macos-notification-state/-/macos-notification-state-1.3.1.tgz", | ||
24632 | "integrity": "sha512-Zd4fezXN4WaXw0fJnO3dr8Eg72AKI4C+g0Jnm5KcX8o7WWvIMV9rzsl8mtuOL8FT+QPYv1xiaLpElqhXubf3Yw==", | ||
24633 | "requires": { | ||
24634 | "bindings": "^1.4.0", | ||
24635 | "nan": "^2.13.2" | ||
24636 | } | ||
24637 | }, | ||
24638 | "macos-release": { | 24639 | "macos-release": { |
24639 | "version": "2.4.1", | 24640 | "version": "2.4.1", |
24640 | "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz", | 24641 | "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.4.1.tgz", |
diff --git a/recipes b/recipes | |||
Subproject 6ce9db9026c9d30df49e1dffee33cc6a69d271b | Subproject fe702592c1cb816c78cbb5476d5fe0e1ac77aa5 | ||
diff --git a/src/internal-server b/src/internal-server | |||
Subproject ae1edff6d5139e5912a8f99dac8da274add7fd7 | Subproject b8e39c293c4d58c42f3cddafbd0125fcba5e933 | ||