Skip to content

Commit

Permalink
Merge a4442b9 into 671ea5e
Browse files Browse the repository at this point in the history
  • Loading branch information
cheton committed Mar 7, 2019
2 parents 671ea5e + a4442b9 commit d3c676b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Expand Up @@ -88,7 +88,7 @@ after_success:
- mkdir -p releases
- |
# build:mac-x64
if [[ "$TRAVIS_NODE_VERSION" == "8" && "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$TRAVIS_NODE_VERSION" == "10" && "$TRAVIS_OS_NAME" == "osx" ]]; then
# https://github.com/electron-userland/electron-builder/issues/398
security import "scripts/certs/Certum-Code-Signing-CA-SHA2.cer" -k ~/Library/Keychains/login.keychain -T /usr/bin/codesign;
# https://github.com/electron-userland/electron-osx-sign/issues/83
Expand Down Expand Up @@ -118,7 +118,7 @@ after_success:
fi
- |
# build:linux-ia32
if [[ "$TRAVIS_NODE_VERSION" == "8" && "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ "$TRAVIS_NODE_VERSION" == "10" && "$TRAVIS_OS_NAME" == "linux" ]]; then
npm run build:linux-ia32;
ls -al output output/*;
cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-i386.AppImage" "releases/${RELEASE}-linux-i386.AppImage";
Expand Down Expand Up @@ -154,7 +154,7 @@ after_success:
fi
- |
# build:linux-x64
if [[ "$TRAVIS_NODE_VERSION" == "8" && "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ "$TRAVIS_NODE_VERSION" == "10" && "$TRAVIS_OS_NAME" == "linux" ]]; then
npm run build:linux-x64;
ls -al output output/*;
cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-x86_64.AppImage" "releases/${RELEASE}-linux-x86_64.AppImage";
Expand Down Expand Up @@ -190,7 +190,7 @@ after_success:
fi
- |
# docker image
if [[ "$TRAVIS_NODE_VERSION" == "8" && "$TRAVIS_OS_NAME" == "linux" ]]; then
if [[ "$TRAVIS_NODE_VERSION" == "10" && "$TRAVIS_OS_NAME" == "linux" ]]; then
travis_wait 40 scripts/travis-docker-build.sh;
fi
Expand All @@ -208,4 +208,4 @@ deploy:
on:
# https://docs.travis-ci.com/user/deployment#Conditional-Releases-with-on
tags: true # Deploy app only when a tag is applied to the commit
node: '8'
node: '10'
9 changes: 5 additions & 4 deletions appveyor.yml
Expand Up @@ -13,7 +13,8 @@ init:

environment:
matrix:
- nodejs_version: "8"
- nodejs_version: "8"
- nodejs_version: "10"
global:
CI_BUILD_NUMBER: $(appveyor_build_number)
GH_TOKEN:
Expand Down Expand Up @@ -73,7 +74,7 @@ build_script:
- ps: echo "$RELEASE"
- ps: mkdir releases
- ps: |
if ($env:nodejs_version -eq '8' -And $env:platform -eq 'x64') {
if ($env:nodejs_version -eq '10' -And $env:platform -eq 'x64') {
npm run build:win-x64
Get-ChildItem output
Copy-Item "output\${PRODUCT_NAME} Setup ${PACKAGE_VERSION}.exe" "releases\${RELEASE}-win-x64.exe"
Expand All @@ -85,7 +86,7 @@ build_script:
}
}
- ps: |
if ($env:nodejs_version -eq '8' -And $env:platform -eq 'x64') {
if ($env:nodejs_version -eq '10' -And $env:platform -eq 'x64') {
npm run build:win-ia32
Get-ChildItem output
Copy-Item "output\${PRODUCT_NAME} Setup ${PACKAGE_VERSION}.exe" "releases\${RELEASE}-win-ia32.exe"
Expand Down Expand Up @@ -115,4 +116,4 @@ deploy:
prerelease: false
on:
appveyor_repo_tag: true # deploy on tag push only
nodejs_version: "8"
nodejs_version: "10"
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -308,7 +308,7 @@
"extract-text-webpack-plugin": "~3.0.2",
"file-loader": "~1.1.11",
"find-imports": "~0.5.2",
"github-release-cli": "~0.4.1",
"github-release-cli": "~1.0.1",
"glob": "~7.1.2",
"html-webpack-plugin": "~3.2.0",
"i18next-scanner": "~2.6.4",
Expand Down

0 comments on commit d3c676b

Please sign in to comment.