Skip to content

Commit 93d21a2

Browse files
committed
fix: revert cross-platform CI matrix and use self-hosted for security
GitHub-hosted runners fail to provision on this private org repo. Revert unit-test job to self-hosted runner. Trim security workflow to npm audit only (Gitleaks and Trivy are Docker-based and need Linux runners). Update changelog accordingly. Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
1 parent 407c660 commit 93d21a2

3 files changed

Lines changed: 11 additions & 46 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ concurrency:
1414

1515
jobs:
1616
unit-test:
17-
strategy:
18-
matrix:
19-
os: [ubuntu-latest, windows-latest, macos-latest]
20-
runs-on: ${{ matrix.os }}
17+
runs-on:
18+
- self-hosted
19+
- macOS
20+
- ARM64
21+
- patchloom-vscode
2122
timeout-minutes: 10
2223
steps:
2324
- name: Checkout

.github/workflows/security.yml

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,13 @@ concurrency:
1616
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
1717

1818
jobs:
19-
gitleaks:
20-
name: Secret detection
21-
runs-on: ubuntu-latest
22-
timeout-minutes: 5
23-
steps:
24-
- name: Checkout
25-
uses: actions/checkout@v6
26-
with:
27-
fetch-depth: 0
28-
29-
- name: Gitleaks
30-
uses: gitleaks/gitleaks-action@v2
31-
env:
32-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33-
34-
trivy:
35-
name: Vulnerability scan
36-
runs-on: ubuntu-latest
37-
timeout-minutes: 10
38-
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v6
41-
42-
- name: Setup Node.js
43-
uses: actions/setup-node@v6
44-
with:
45-
node-version-file: .nvmrc
46-
cache: npm
47-
48-
- name: Install dependencies
49-
run: npm ci
50-
51-
- name: Trivy filesystem scan
52-
uses: aquasecurity/trivy-action@master
53-
with:
54-
scan-type: fs
55-
severity: HIGH,CRITICAL
56-
exit-code: 1
57-
5819
npm-audit:
5920
name: npm audit
60-
runs-on: ubuntu-latest
21+
runs-on:
22+
- self-hosted
23+
- macOS
24+
- ARM64
25+
- patchloom-vscode
6126
timeout-minutes: 5
6227
steps:
6328
- name: Checkout

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,5 @@
3131
### Infrastructure
3232

3333
- Automated test harness with unit tests and VS Code extension integration tests
34-
- Cross-platform CI matrix (Ubuntu, macOS, Windows) for unit tests
35-
- Self-hosted runner for build, packaging, and integration tests
34+
- CI on self-hosted runner with npm audit security scanning
3635
- Extension packaging with `@vscode/vsce`

0 commit comments

Comments
 (0)