Skip to content

Try moving build to just gulp #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcreedcmu merged 21 commits into from
Jul 21, 2020
Merged

Try moving build to just gulp #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e5e8548
Remove now-unused libraries.
jcreedcmu Jul 14, 2020
ac941eb
Copy semmle-vscode-utils into extension.
jcreedcmu Jul 14, 2020
53d5c24
Remove now unused library.
jcreedcmu Jul 14, 2020
657df5e
inline tsconfig inheritance
jcreedcmu Jul 14, 2020
f005591
Remove typescript-config package
jcreedcmu Jul 14, 2020
2c5b672
Make stub typescript gulpfile
jcreedcmu Jul 14, 2020
528cbc8
Move more config into local typescript gulpfile
jcreedcmu Jul 14, 2020
49c0d39
Replace javascript gulpfile with typescript
jcreedcmu Jul 14, 2020
9083c5d
Reconcile vscode-engine and api versions
jcreedcmu Jul 16, 2020
56b62ff
Fix package deploy to not depend on rush
jcreedcmu Jul 16, 2020
19a76dc
Update action to not depend on rush
jcreedcmu Jul 16, 2020
2b53396
Fix warning
jcreedcmu Jul 16, 2020
bce3413
Run npm-installed copy of vsce
jcreedcmu Jul 16, 2020
d213890
Fix test section of workflow file
jcreedcmu Jul 16, 2020
b7a72b9
Remove now unused rush configuration
jcreedcmu Jul 16, 2020
258f431
Relax version constraints in package.json
jcreedcmu Jul 16, 2020
2671414
Extract rush from vscode tasks
jcreedcmu Jul 21, 2020
cd329ee
Fix source maps
jcreedcmu Jul 21, 2020
3c07be5
Move type dependency to devDependencies
jcreedcmu Jul 21, 2020
f8804f9
Use explicit path for vsce
jcreedcmu Jul 21, 2020
9ad0bf6
Call into package.json scripts from actions workflow
jcreedcmu Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ jobs:
node-version: '10.18.1'

- name: Install dependencies
run: node common/scripts/install-run-rush.js install
run: |
cd extensions/ql-vscode
npm install
shell: bash

- name: Build
run: node common/scripts/install-run-rush.js build
run: |
cd extensions/ql-vscode
npm run build
shell: bash

- name: Prepare artifacts
Expand Down Expand Up @@ -57,11 +61,15 @@ jobs:

# We have to build the dependencies in `lib` before running any tests.
- name: Install dependencies
run: node common/scripts/install-run-rush.js install
run: |
cd extensions/ql-vscode
npm install
shell: bash

- name: Build
run: node common/scripts/install-run-rush.js build
run: |
cd extensions/ql-vscode
npm run build
shell: bash

- name: Lint
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,15 @@ jobs:
node-version: '10.18.1'

- name: Install dependencies
run: node common/scripts/install-run-rush.js install
run: |
cd extensions/ql-vscode
npm install
shell: bash

- name: Build
run: node common/scripts/install-run-rush.js build --release
run: |
cd extensions/ql-vscode
npm run build -- --release
shell: bash

- name: Prepare artifacts
Expand Down
16 changes: 6 additions & 10 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql"
"--extensionDevelopmentPath=${workspaceRoot}/extensions/ql-vscode"
],
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
"${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-bqrs/out/**/*.js",
"${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-io/out/**/*.js",
"${workspaceRoot}/dist/vscode-codeql/node_modules/semmle-io-node/out/**/*.js",
"${workspaceRoot}/dist/vscode-codeql/node_modules/@github/codeql-vscode-utils/out/**/*.js"
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
],
"preLaunchTask": "Build"
},
Expand Down Expand Up @@ -54,13 +50,13 @@
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql",
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/no-workspace/index"
],
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
"${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/**/*.js"
],
"preLaunchTask": "Build"
Expand All @@ -71,14 +67,14 @@
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": [
"--extensionDevelopmentPath=${workspaceRoot}/dist/vscode-codeql",
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
"--extensionTestsPath=${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/minimal-workspace/index",
"${workspaceRoot}/extensions/ql-vscode/test/data"
],
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/dist/vscode-codeql/out/**/*.js",
"${workspaceRoot}/extensions/ql-vscode/out/**/*.js",
"${workspaceRoot}/extensions/ql-vscode/out/vscode-tests/**/*.js"
],
"preLaunchTask": "Build"
Expand Down
66 changes: 9 additions & 57 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"kind": "build",
"isDefault": true
},
"command": "node common/scripts/install-run-rush.js build --verbose",
"command": "npx gulp buildWithoutPackage --verbose",
Copy link
Copy Markdown
Contributor

@aeisenberg aeisenberg Jul 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think we need npx here. We can assume users have already run npm run build -- buildWithoutPackage --verbose before running in vs code. So, just do the same, but remove npx. You may need to add a full path here, so ${workspaceRoot}/extensions/ql-vscode/node_modules/.bin/gulp.

Copy link
Copy Markdown
Contributor Author

@jcreedcmu jcreedcmu Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sort of like npx as a terse idiom here, but I don't mind being more explicit if you think it's better to avoid the magic of npx auto-downloading packages. I'm pretty sure we already need to be in the correct cwd to have gulp work, so a path relative to extensions/ql-vscode should work.

Copy link
Copy Markdown
Contributor

@aeisenberg aeisenberg Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My concern with npx is with versioning. I've had situations before where people ran into different behaviour because npx had installed different versions. If we are running from the node_modules directory, this won't happen.

"options": {
"cwd": "extensions/ql-vscode/"
},
"presentation": {
"echo": true,
"reveal": "always",
Expand All @@ -33,64 +36,13 @@
"$ts-webpack"
]
},
{
"label": "Rebuild",
"type": "shell",
"group": "build",
"command": "node common/scripts/install-run-rush.js rebuild --verbose",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": true
},
"problemMatcher": [
{
"owner": "typescript",
"fileLocation": "absolute",
"pattern": {
"regexp": "^\\[gulp-typescript\\] ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): error TS\\d+: (.*)$",
"file": 1,
"location": 2,
"message": 3
}
}
]
},
{
"label": "Update",
"type": "shell",
"command": "node common/scripts/install-run-rush.js update",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": true
},
"problemMatcher": []
},
{
"label": "Update (full)",
"type": "shell",
"command": "node common/scripts/install-run-rush.js update --full",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared",
"showReuseMessage": true,
"clear": true
},
"problemMatcher": []
},
{
"label": "Format",
"type": "shell",
"command": "node common/scripts/install-run-rush.js format",
"command": "npm run format",
"options": {
"cwd": "extensions/ql-vscode/"
},
"presentation": {
"echo": true,
"reveal": "always",
Expand All @@ -111,4 +63,4 @@
"group": "build"
}
]
}
}
28 changes: 0 additions & 28 deletions common/config/LICENSE
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions common/config/rush/.npmrc
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions common/config/rush/command-line.json
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions common/config/rush/common-versions.json
View file
Open in desktop

This file was deleted.

Loading