From 51bf83739b88665cf1b8536a4af1045b6f09c344 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sun, 29 Jun 2025 12:08:30 -0400 Subject: [PATCH 1/4] internal: add ci for vscode extension --- .github/workflows/vscode.yml | 96 ++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 .github/workflows/vscode.yml diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml new file mode 100644 index 00000000..045a6b5b --- /dev/null +++ b/.github/workflows/vscode.yml @@ -0,0 +1,96 @@ +name: VSCode + +on: + push: + branches: + - master + tags: + - "**" + pull_request: + +jobs: + pre_job: + runs-on: ubuntu-latest + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip }} + paths_result: ${{ steps.skip_check.outputs.paths_result }} + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@c449d86cf33a2a6c7a4193264cc2578e2c3266d4 # pin@v4 + with: + paths: '["squawk-vscode/**"]' + + typecheck: + needs: pre_job + if: needs.pre_job.outputs.should_skip != 'true' + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup pnpm + uses: pnpm/action-setup@v2 + with: + version: 8 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version-file: "squawk-vscode/package.json" + cache-dependency-path: "squawk-vscode/pnpm-lock.yaml" + cache: "pnpm" + - name: Install JS dependencies + working-directory: "squawk-vscode" + run: pnpm install + + - name: Run type check + working-directory: "squawk-vscode" + run: pnpm run check-types + + lint: + needs: pre_job + if: needs.pre_job.outputs.should_skip != 'true' + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup pnpm + uses: pnpm/action-setup@v2 + with: + version: 8 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version-file: "squawk-vscode/package.json" + cache-dependency-path: "squawk-vscode/pnpm-lock.yaml" + cache: "pnpm" + - name: Install JS dependencies + working-directory: "squawk-vscode" + run: pnpm install + + - name: Run lints + working-directory: "squawk-vscode" + run: pnpm run lint + + test: + needs: pre_job + if: needs.pre_job.outputs.should_skip != 'true' + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup pnpm + uses: pnpm/action-setup@v2 + with: + version: 8 + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version-file: "squawk-vscode/package.json" + cache-dependency-path: "squawk-vscode/pnpm-lock.yaml" + cache: "pnpm" + - name: Install JS dependencies + working-directory: "squawk-vscode" + run: pnpm install + + - name: Run tests + working-directory: "squawk-vscode" + run: pnpm run test From 39c703991935d0ff8e15679c7c596382e833105d Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sun, 29 Jun 2025 12:14:25 -0400 Subject: [PATCH 2/4] attempt fix --- squawk-vscode/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squawk-vscode/package.json b/squawk-vscode/package.json index e326006c..801c186b 100644 --- a/squawk-vscode/package.json +++ b/squawk-vscode/package.json @@ -39,7 +39,7 @@ "package": "node esbuild.js --production", "compile-tests": "tsc -p . --outDir out", "watch-tests": "tsc -p . -w --outDir out", - "pretest": "pnpm run compile-tests && pnpm run compile && pnpm run lint", + "pretest": "pnpm run compile-tests && pnpm run compile", "check-types": "tsc --noEmit", "lint": "eslint src", "test": "vscode-test" From 67f34e2296a2ded1c732d81055ea0625f00995bf Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sun, 29 Jun 2025 12:25:22 -0400 Subject: [PATCH 3/4] maybe fix eslint --- squawk-vscode/package.json | 1 + squawk-vscode/pnpm-lock.yaml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/squawk-vscode/package.json b/squawk-vscode/package.json index 801c186b..5b54e018 100644 --- a/squawk-vscode/package.json +++ b/squawk-vscode/package.json @@ -55,6 +55,7 @@ "@vscode/vsce": "^3.6.0", "esbuild": "^0.24.0", "eslint": "^9.16.0", + "globals": "^16.2.0", "npm-run-all": "^4.1.5", "prettier": "^3.6.2", "typescript": "^5.7.2", diff --git a/squawk-vscode/pnpm-lock.yaml b/squawk-vscode/pnpm-lock.yaml index 2aa200fc..76748ba5 100644 --- a/squawk-vscode/pnpm-lock.yaml +++ b/squawk-vscode/pnpm-lock.yaml @@ -38,6 +38,9 @@ importers: eslint: specifier: ^9.16.0 version: 9.29.0 + globals: + specifier: ^16.2.0 + version: 16.2.0 npm-run-all: specifier: ^4.1.5 version: 4.1.5 @@ -1181,6 +1184,10 @@ packages: resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} engines: {node: '>=18'} + globals@16.2.0: + resolution: {integrity: sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==} + engines: {node: '>=18'} + globalthis@1.0.4: resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==} engines: {node: '>= 0.4'} @@ -3804,6 +3811,8 @@ snapshots: globals@14.0.0: {} + globals@16.2.0: {} + globalthis@1.0.4: dependencies: define-properties: 1.2.1 From 411c0fa3cdc5a5262c0a4ffac8f5a6af8ab8d894 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sun, 29 Jun 2025 12:34:59 -0400 Subject: [PATCH 4/4] fix? --- .github/workflows/vscode.yml | 2 +- squawk-vscode/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml index 045a6b5b..231cdad1 100644 --- a/.github/workflows/vscode.yml +++ b/.github/workflows/vscode.yml @@ -93,4 +93,4 @@ jobs: - name: Run tests working-directory: "squawk-vscode" - run: pnpm run test + run: xvfb-run pnpm run test diff --git a/squawk-vscode/package.json b/squawk-vscode/package.json index 5b54e018..3de17c06 100644 --- a/squawk-vscode/package.json +++ b/squawk-vscode/package.json @@ -32,7 +32,7 @@ }, "scripts": { "vscode:prepublish": "pnpm run package", - "compile": "pnpm run check-types && pnpm run lint && node esbuild.js", + "compile": "pnpm run check-types && node esbuild.js", "watch": "npm-run-all -p watch:*", "watch:esbuild": "node esbuild.js --watch", "watch:tsc": "tsc --noEmit --watch --project tsconfig.json",