Skip to content

Commit

Permalink
Store .vsix as part of appveyor CI (#322)
Browse files Browse the repository at this point in the history
* Store .vsix as part of appveyor CI
* Mimic what is done by Angular to fix the issue for `ajv` and `ajv-keywords`
* Store .vsix on CircleCI
  • Loading branch information
vazexqi committed Feb 25, 2018
1 parent 40bbf5e commit 635fff3
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@ test_script:
exit $NpmTestsExitCode
}
- npm run coverage:system-tests

after_test:
- npm run vscode:package

artifacts:
- path: '**\*.vsix'

on_finish:
- del C:\projects\devhub.key
- codecov --disable=gcov
Expand Down
10 changes: 8 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
#
version: 2
jobs:
build:
Expand All @@ -9,14 +9,20 @@ jobs:
- SFDX_AUTOUPDATE_DISABLE=true
- SFDX_USE_GENERIC_UNIX_KEYCHAIN=true
- SFDX_DOMAIN_RETRY=300

steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "package.json" }}
- run: npm install
- run: npm run compile
- run: npm run vscode:package
- run:
command: |
mkdir extensions
find . -name "*.vsix" -type f -exec cp {} ./extensions \;
- store_artifacts:
path: ./extensions
- save_cache:
key: dependency-cache-{{ checksum "package.json" }}
paths:
Expand Down
22 changes: 15 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,34 @@
"shx": "0.2.2",
"tslint": "5.5.0",
"typescript": "2.6.2",
"ajv": "6.1.1",
"vsce": "^1.36.3"
},
"scripts": {
"postinstall": "lerna bootstrap -- --no-package-lock && node scripts/reformat-with-prettier",
"bootstrap": "lerna bootstrap -- --no-package-lock && node scripts/reformat-with-prettier",
"postinstall":
"lerna bootstrap -- --no-package-lock && node scripts/reformat-with-prettier",
"bootstrap":
"lerna bootstrap -- --no-package-lock && node scripts/reformat-with-prettier",
"clean": "lerna run clean",
"compile": "lerna run --stream compile",
"lint": "lerna run lint",
"publish": "node scripts/publish.js",
"test": "lerna run test --concurrency 1 --stream",
"test:unit": "lerna run test:unit --concurrency 1 --stream",
"test:integration": "lerna run test:integration --concurrency 1 --stream",
"test:without-system-tests": "lerna run test --ignore system-tests --concurrency 1 --stream",
"test:system-tests": "lerna run test --scope system-tests --concurrency 1 --stream",
"coverage:system-tests": "lerna run coverage --scope system-tests --concurrency 1 --stream",
"vscode:package": "lerna exec --scope @salesforce/salesforcedx-* -- npm prune --production && lerna run vscode:package --concurrency 1 && node scripts/reformat-with-prettier",
"test:without-system-tests":
"lerna run test --ignore system-tests --concurrency 1 --stream",
"test:system-tests":
"lerna run test --scope system-tests --concurrency 1 --stream",
"coverage:system-tests":
"lerna run coverage --scope system-tests --concurrency 1 --stream",
"vscode:package":
"lerna exec --scope @salesforce/salesforcedx-* -- npm prune --production && lerna run vscode:package --concurrency 1 && node scripts/reformat-with-prettier",
"vscode:sha256": "lerna run vscode:sha256 --concurrency 1",
"vscode:publish": "lerna run vscode:publish --concurrency 1",
"watch": "lerna run --parallel watch",
"eslint-check": "eslint --print-config .eslintrc.json | eslint-config-prettier-check"
"eslint-check":
"eslint --print-config .eslintrc.json | eslint-config-prettier-check"
},
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/salesforcedx-vscode-lwc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"categories": ["Languages"],
"dependencies": {
"@salesforce/salesforcedx-utils-vscode": "42.4.0",
"ajv": "^6.1.1",
"eslint": "4.16.0",
"eslint-plugin-lwc": "0.3.2",
"lwc-language-server": "0.16.4",
Expand Down

0 comments on commit 635fff3

Please sign in to comment.