Skip to content

Commit

Permalink
Update Build Infrastructure (#225)
Browse files Browse the repository at this point in the history
* Use Trusty image for build
* Use XCode 9.1
* Bump vscode version to 1.1.8
* Update codecov ignored paths
* Disable gcov on AppVeyor (causes long path issues)
* Allow Linux builds to fail
* Setting CODE_DOWNLOAD_URL won't help

With all the tweaks the macOS builds seem to run more reliably then the Linux builds. However, the performance varies because of limites macOS capacity. This is covered in our GitHub setup already by not requiring the Travis build to pass for PRs.

See also microsoft/vscode-extension-vscode#88
  • Loading branch information
guw authored Dec 1, 2017
1 parent 1569c5f commit 4859c72
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ test_script:

on_finish:
- del C:\projects\devhub.key
- codecov
- codecov --disable=gcov

10 changes: 9 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
coverage:
# See http://docs.codecov.io/docs/ignoring-paths
ignore:
# compiled output
- "**/out"
# dependencies
- "**/node_modules"
# IDEs and editors
- ".vscode"
# other (more specific)
- "packages/salesforcedx-visualforce-markup-language-server/src/beautify" # This folder contains generated files that we have embedded
- "packages/salesforcedx-visualforce-markup-language-server/src/parser/htmlTags.ts" # This file is a collection of all HTML tags
- "packages/salesforcedx-visualforce-markup-language-server/src/parser/visualforceTags.ts" # This file is a collection of all Visualforce tags
- "packages/salesforcedx-visualforce-markup-language-server/src/parser/visualforceTags.ts" # This file is a collection of all Visualforce tags
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ notifications:

matrix:
allow_failures:
- os: linux
- os: osx
fast_finish: true

Expand All @@ -30,7 +31,8 @@ os:
- linux
- osx

osx_image: xcode9
osx_image: xcode9.1
dist: trusty

addons:
apt:
Expand All @@ -40,9 +42,9 @@ addons:
before_install:
- |
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
sh -e /etc/init.d/xvfb start;
sleep 3;
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
sleep 3
# install CLI
echo Installing SFDX CLI Linux
travis_retry wget -qO- $SFDX_URL_LINUX | tar xJf -
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-slds-linter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"sinon": "^2.3.6",
"source-map-support": "^0.4.15",
"typescript": "2.4.0",
"vscode": "1.1.2"
"vscode": "1.1.8"
},
"scripts": {
"vscode:package": "npm prune --production",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-vscode-apex/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"nyc": "^11.0.2",
"shelljs": "^0.7.8",
"typescript": "2.4.0",
"vscode": "1.1.2"
"vscode": "1.1.8"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-vscode-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"nyc": "^11.0.2",
"sinon": "^2.3.6",
"typescript": "2.4.0",
"vscode": "1.1.2"
"vscode": "1.1.8"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-vscode-lightning/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"mocha": "3.2.0",
"sinon": "^2.3.6",
"typescript": "2.4.0",
"vscode": "1.1.2"
"vscode": "1.1.8"
},
"scripts": {
"vscode:prepublish": "npm prune --production",
Expand Down
2 changes: 1 addition & 1 deletion packages/system-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"source-map-support": "^0.4.15",
"spectron": "^3.7.2",
"typescript": "2.4.0",
"vscode": "1.1.2"
"vscode": "1.1.8"
},
"scripts": {
"compile": "tsc -p ./",
Expand Down

0 comments on commit 4859c72

Please sign in to comment.