Skip to content

Commit

Permalink
travis CI: simplify config
Browse files Browse the repository at this point in the history
  • Loading branch information
@vladimiry
vladimiry committed Feb 25, 2018
1 parent cd9aa26 commit 4bd48bf
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 83 deletions.
17 changes: 1 addition & 16 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,7 @@ before_script:
eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start);
dbus-launch /usr/bin/python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');"
fi
script:
- yarn run app:dist
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then yarn run electron-builder:release:x64; fi
- |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
docker run --rm -ti \
--env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
--env ELECTRON_CACHE="/root/.cache/electron" \
--env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
-v ${PWD}:/project \
-v ${PWD##*/}-node-modules:/project/node_modules \
-v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
electronuserland/builder \
/bin/bash -c "apt-get update && apt-get install libsecret-1-dev -y && yarn && PATH=/snap/bin:$PATH && yarn run electron-builder:release:x64:linux"
fi
script: ./scripts/travis.sh
after_failure:
- $(git ls-files -o | grep -Fv -e node_modules -e app -e dist >> failure-files.list)
- tar cvzf $FAILURE_ARCHIVE_FILE $(cat failure-files.list)
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
"cssnano": "3.10.0",
"devtron": "1.4.0",
"electron": "2.0.0-beta.1",
"electron-builder": "20.0.9",
"electron-builder-squirrel-windows": "20.0.5",
"electron-builder": "20.2.0",
"electron-builder-squirrel-windows": "20.2.0",
"electron-rebuild": "1.7.3",
"exports-loader": "0.7.0",
"extended-define-webpack-plugin": "0.1.3",
Expand Down Expand Up @@ -153,7 +153,7 @@
"sass-lint": "1.12.1",
"sass-loader": "6.0.6",
"script-loader": "0.7.2",
"sinon": "4.4.0",
"sinon": "4.4.1",
"source-map-loader": "0.2.3",
"source-map-support": "0.5.3",
"spectron": "3.8.0",
Expand All @@ -166,7 +166,7 @@
"tslint": "5.9.1",
"tslint-rules-bunch": "0.0.4",
"typescript": "2.7.2",
"uglifyjs-webpack-plugin": "1.2.0",
"uglifyjs-webpack-plugin": "1.2.2",
"url-loader": "0.6.2",
"wait-on": "2.1.0",
"webpack": "3.11.0",
Expand Down
22 changes: 22 additions & 0 deletions scripts/travis.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

set -ev

yarn run app:dist

if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
yarn run electron-builder:release:x64
fi

if [ "$TRAVIS_OS_NAME" == "linux" ]; then
docker run --rm -ti \
--env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
--env ELECTRON_CACHE="/root/.cache/electron" \
--env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
-v ${PWD}:/project \
-v ${PWD##*/}-node-modules:/project/node_modules \
-v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \
electronuserland/builder \
/bin/bash -c "yarn && yarn run electron-builder:release:x64:linux"
fi
5 changes: 2 additions & 3 deletions src/e2e/util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ export async function initApp(t: TestContext, options: { initial: boolean }) {
NODE_ENV: "e2e",
TEST_USER_DATA_DIR: userDataDirPath,
},
args: [
mainScriptFilePath,
],
args: [mainScriptFilePath],
// chromeDriverArgs: process.env.CI ? [/*"headless", */"no-sandbox", "disable-gpu"] : [],
webdriverLogPath: webdriverLogDirPath,
chromeDriverLogPath: chromeDriverLogFilePath,

Expand Down
121 changes: 61 additions & 60 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,25 +424,25 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"

app-builder-bin-linux@1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.3.8.tgz#138eaddce970fb485b715e8c3cd88064aee4efb4"
app-builder-bin-linux@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.5.0.tgz#c22df1ab9ee7fb0270ec27a3c8a6993966ea4220"

app-builder-bin-mac@1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.3.8.tgz#ca7fa326ffeea0eb70cbdce1715ebb27b2ebb7a2"
app-builder-bin-mac@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.5.0.tgz#40821128a1f20e0559f1fca71a59ecab81bb59b5"

app-builder-bin-win@1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.3.8.tgz#5f48cbe5ca9b200a11b7f786c7de486b53543df9"
app-builder-bin-win@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.5.0.tgz#0a12437d825ac89fc2357e8be0ba855f54c083e9"

app-builder-bin@1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.3.8.tgz#f0f2f41d5fa30aad7b2543d7263d2139c8a918ec"
app-builder-bin@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.5.0.tgz#dc768af9704876959c68af5456ef31f67a4663fe"
optionalDependencies:
app-builder-bin-linux "1.3.8"
app-builder-bin-mac "1.3.8"
app-builder-bin-win "1.3.8"
app-builder-bin-linux "1.5.0"
app-builder-bin-mac "1.5.0"
app-builder-bin-win "1.5.0"

app-root-path@^2.0.1:
version "2.0.1"
Expand Down Expand Up @@ -1470,12 +1470,12 @@ [email protected], builder-util-runtime@^4.0.5, builder-util-runtime@~4
fs-extra-p "^4.5.0"
sax "^1.2.4"

builder-util@5.4.1, builder-util@^5.3.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.4.1.tgz#a387252162bca5a54e8ed979f2a45a63fc3d7b42"
builder-util@5.6.0, builder-util@^5.6.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.0.tgz#c37c5207cd818531bda819ac836b6d51dfbccd4a"
dependencies:
"7zip-bin" "~3.1.0"
app-builder-bin "1.3.8"
app-builder-bin "1.5.0"
bluebird-lst "^1.0.5"
builder-util-runtime "^4.0.5"
chalk "^2.3.0"
Expand Down Expand Up @@ -2588,14 +2588,14 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"

[email protected].0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.0.tgz#40b6ce05b59a3baebd69680a1f2875b1ff475e24"
[email protected].1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.1.tgz#a12214eb3eb3cba0addccfd129f1981c9805045c"
dependencies:
bluebird-lst "^1.0.5"
builder-util "^5.3.0"
electron-builder-lib "~20.0.5"
fs-extra-p "^4.5.0"
builder-util "^5.6.0"
electron-builder-lib "~20.2.0"
fs-extra-p "^4.5.2"
iconv-lite "^0.4.19"
js-yaml "^3.10.0"
parse-color "^1.0.0"
Expand Down Expand Up @@ -2724,21 +2724,21 @@ ejs@^2.5.7, ejs@~2.5.6:
version "2.5.7"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"

electron-builder-lib@20.0.9, electron-builder-lib@~20.0.5:
version "20.0.9"
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.0.9.tgz#62d06eb8536ee6d85f82f9416c6e452dffa4734f"
electron-builder-lib@20.2.0, electron-builder-lib@~20.2.0:
version "20.2.0"
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.2.0.tgz#e8dba288cf26858803eb1800da870d7312837bfa"
dependencies:
"7zip-bin" "~3.1.0"
app-builder-bin "1.3.8"
app-builder-bin "1.5.0"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.5"
builder-util "5.4.1"
builder-util "5.6.0"
builder-util-runtime "4.0.5"
chromium-pickle-js "^0.2.0"
debug "^3.1.0"
ejs "^2.5.7"
electron-osx-sign "0.4.8"
electron-publish "20.0.6"
electron-publish "20.2.0"
fs-extra-p "^4.5.2"
hosted-git-info "^2.5.0"
is-ci "^1.1.0"
Expand All @@ -2753,28 +2753,28 @@ [email protected], electron-builder-lib@~20.0.5:
semver "^5.5.0"
temp-file "^3.1.1"

electron-builder-squirrel-windows@20.0.5:
version "20.0.5"
resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-20.0.5.tgz#628e118975d64080eecf739cce1ff1cf1b5fbe2f"
electron-builder-squirrel-windows@20.2.0:
version "20.2.0"
resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-20.2.0.tgz#7638a2b213ecad25a04b35c44a08138a3cffc727"
dependencies:
archiver "^2.1.1"
bluebird-lst "^1.0.5"
builder-util "^5.3.0"
fs-extra-p "^4.5.0"
builder-util "^5.6.0"
fs-extra-p "^4.5.2"
sanitize-filename "^1.6.1"
optionalDependencies:
"7zip-bin" "~3.1.0"

electron-builder@20.0.9:
version "20.0.9"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.0.9.tgz#85f1b18a42104409d785b5babfca5c464b0a265e"
electron-builder@20.2.0:
version "20.2.0"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.2.0.tgz#aaeaa439cb96c9a3d7ffda25b28130327c982982"
dependencies:
bluebird-lst "^1.0.5"
builder-util "5.4.1"
builder-util "5.6.0"
builder-util-runtime "4.0.5"
chalk "^2.3.0"
dmg-builder "4.1.0"
electron-builder-lib "20.0.9"
dmg-builder "4.1.1"
electron-builder-lib "20.2.0"
electron-download-tf "4.3.4"
fs-extra-p "^4.5.2"
is-ci "^1.1.0"
Expand Down Expand Up @@ -2852,12 +2852,12 @@ [email protected]:
minimist "^1.2.0"
plist "^2.1.0"

electron-publish@20.0.6:
version "20.0.6"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.0.6.tgz#24a3c508428eea31813e064f80468f626dff1d87"
electron-publish@20.2.0:
version "20.2.0"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.2.0.tgz#1812738c4a4e14a8e156a9a083424a6e4e8e8264"
dependencies:
bluebird-lst "^1.0.5"
builder-util "^5.3.0"
builder-util "^5.6.0"
builder-util-runtime "^4.0.5"
chalk "^2.3.0"
fs-extra-p "^4.5.2"
Expand Down Expand Up @@ -5810,8 +5810,8 @@ micromatch@^2.1.5, micromatch@^2.3.11:
regex-cache "^0.4.2"

micromatch@^3.0.3, micromatch@^3.0.4, micromatch@^3.1.4, micromatch@^3.1.5:
version "3.1.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.8.tgz#5c8caa008de588eebb395e8c0ad12c128f25fff1"
version "3.1.9"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
dependencies:
arr-diff "^4.0.0"
array-unique "^0.3.2"
Expand Down Expand Up @@ -7551,7 +7551,7 @@ regex-cache@^0.4.2:
dependencies:
is-equal-shallow "^0.1.3"

regex-not@^1.0.0:
regex-not@^1.0.0, regex-not@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
dependencies:
Expand Down Expand Up @@ -8181,9 +8181,9 @@ single-line-log@^1.1.2:
dependencies:
string-width "^1.0.1"

[email protected].0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.4.0.tgz#5bdbe9c96c6a2904d2fddde6316c1c9b7dc70ebe"
[email protected].1:
version "4.4.1"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.4.1.tgz#68819f18be164078d03d4fc40ce0691d1f666eb5"
dependencies:
"@sinonjs/formatio" "^2.0.0"
diff "^3.1.0"
Expand Down Expand Up @@ -8949,12 +8949,13 @@ to-regex-range@^2.1.0:
repeat-string "^1.6.1"

to-regex@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae"
version "3.0.2"
resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
dependencies:
define-property "^0.2.5"
extend-shallow "^2.0.1"
regex-not "^1.0.0"
define-property "^2.0.2"
extend-shallow "^3.0.2"
regex-not "^1.0.2"
safe-regex "^1.1.0"

[email protected]:
version "1.1.5"
Expand Down Expand Up @@ -9149,9 +9150,9 @@ uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"

[email protected].0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.0.tgz#f706fa4c655000a086b4a97c7d835ed0f6e9b0ef"
[email protected].2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.2.tgz#e7516d4367afdb715c3847841eb46f94c45ca2b9"
dependencies:
cacache "^10.0.1"
find-cache-dir "^1.0.0"
Expand Down

0 comments on commit 4bd48bf

Please sign in to comment.