Fixes for CI

This commit is contained in:
Scott Nonnenberg 2019-08-21 15:50:50 -07:00
parent 90c2a97aa7
commit c570a92e76
3 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- '10.13.0' - '12.4.0'
os: os:
- linux - linux
dist: trusty dist: trusty
@ -13,7 +13,7 @@ script:
- yarn lint - yarn lint
- yarn lint-deps - yarn lint-deps
- yarn prepare-beta-build - yarn prepare-beta-build
- $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never --config.directories.output=release - $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never --config.directories.output=release
- ./travis.sh - ./travis.sh
env: env:
global: global:

View file

@ -8,7 +8,7 @@ cache:
install: install:
- systeminfo | findstr /C:"OS" - systeminfo | findstr /C:"OS"
- set PATH=C:\Ruby23-x64\bin;%PATH% - set PATH=C:\Ruby23-x64\bin;%PATH%
- ps: Install-Product node 10.13.0 x64 - ps: Install-Product node 12.4.0 x64
- ps: .\build\install-yarn.ps1 - ps: .\build\install-yarn.ps1
- yarn install --frozen-lockfile - yarn install --frozen-lockfile
@ -21,7 +21,7 @@ build_script:
- type package.json | findstr /v certificateSubjectName > temp.json - type package.json | findstr /v certificateSubjectName > temp.json
- move temp.json package.json - move temp.json package.json
- yarn prepare-beta-build - yarn prepare-beta-build
- node_modules\.bin\build --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release - node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
test_script: test_script:
- node build\grunt.js test - node build\grunt.js test

View file

@ -15,7 +15,7 @@ import {
AttachmentType, AttachmentType,
isImageAttachment, isImageAttachment,
isVideoAttachment, isVideoAttachment,
} from '../../types/attachment'; } from '../../types/Attachment';
// State // State