Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 21 additions & 1 deletion .github/workflows/go-work-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,27 @@ jobs:
ref: ${{ github.head_ref }}
fetch-depth: 3
token: ${{ steps.get-token.outputs.token }}
- uses: ./.github/actions/yarn-install

# Avoid using .github/actions/yarn-install because it runs post-install
# scripts, which can fail because the go module versions may not match.
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
with:
node-version-file: package.json
- run: corepack enable yarn
shell: bash
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
with:
node-version-file: package.json
cache: yarn
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
with:
go-version-file: go.work
cache-dependency-path: src/go/**/go.sum
- run: yarn install --immutable --mode=skip-build
# We use skip-build so that we don't run post install scripts (which will
# attempt to compile golang binaries).
shell: bash

- name: Determine go.mod files
id: go-files
run: >-
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"tsconfig-paths": "4.2.0",
"tsx": "4.21.0",
"typescript": "5.9.3",
"webpack": "5.100.2"
"webpack": "5.103.0"
},
"dependenciesMeta": {
"electron": {
Expand Down
3 changes: 3 additions & 0 deletions scripts/lint-go.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ async function syncModules(fix: boolean): Promise<boolean> {
}
}

// Sync `go` lines in go.mod files to avoid errors if only one was updated.
await spawnFile('go', ['work', 'use']);

const linkedModulesOk = await Promise.all(modFiles.map(f => processLinkedModules(path.dirname(f), fix)));
if (linkedModulesOk.some(v => !v)) {
return false;
Expand Down
147 changes: 145 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7085,6 +7085,15 @@ __metadata:
languageName: node
linkType: hard

"baseline-browser-mapping@npm:^2.9.0":
version: 2.9.10
resolution: "baseline-browser-mapping@npm:2.9.10"
bin:
baseline-browser-mapping: dist/cli.js
checksum: 10c0/e8021a03d7ec00583c83054993a7192dae5065b25de2b2763420116553aeff8297e5ad643c94549f2310f436df0511ade80c7a889251c03af11e68eecbff1fae
languageName: node
linkType: hard

"basic-ftp@npm:^5.0.2":
version: 5.0.5
resolution: "basic-ftp@npm:5.0.5"
Expand Down Expand Up @@ -7248,6 +7257,21 @@ __metadata:
languageName: node
linkType: hard

"browserslist@npm:^4.26.3":
version: 4.28.1
resolution: "browserslist@npm:4.28.1"
dependencies:
baseline-browser-mapping: "npm:^2.9.0"
caniuse-lite: "npm:^1.0.30001759"
electron-to-chromium: "npm:^1.5.263"
node-releases: "npm:^2.0.27"
update-browserslist-db: "npm:^1.2.0"
bin:
browserslist: cli.js
checksum: 10c0/545a5fa9d7234e3777a7177ec1e9134bb2ba60a69e6b95683f6982b1473aad347c77c1264ccf2ac5dea609a9731fbfbda6b85782bdca70f80f86e28a402504bd
languageName: node
linkType: hard

"bs-logger@npm:^0.2.6":
version: 0.2.6
resolution: "bs-logger@npm:0.2.6"
Expand Down Expand Up @@ -7485,6 +7509,13 @@ __metadata:
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.30001759":
version: 1.0.30001760
resolution: "caniuse-lite@npm:1.0.30001760"
checksum: 10c0/cee26dff5c5b15ba073ab230200e43c0d4e88dc3bac0afe0c9ab963df70aaa876c3e513dde42a027f317136bf6e274818d77b073708b74c5807dfad33c029d3c
languageName: node
linkType: hard

"case-sensitive-paths-webpack-plugin@npm:^2.3.0":
version: 2.4.0
resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0"
Expand Down Expand Up @@ -8865,6 +8896,13 @@ __metadata:
languageName: node
linkType: hard

"electron-to-chromium@npm:^1.5.263":
version: 1.5.267
resolution: "electron-to-chromium@npm:1.5.267"
checksum: 10c0/0732bdb891b657f2e43266a3db8cf86fff6cecdcc8d693a92beff214e136cb5c2ee7dc5945ed75fa1db16e16bad0c38695527a020d15f39e79084e0b2e447621
languageName: node
linkType: hard

"electron-updater@npm:6.7.3":
version: 6.7.3
resolution: "electron-updater@npm:6.7.3"
Expand Down Expand Up @@ -8957,6 +8995,16 @@ __metadata:
languageName: node
linkType: hard

"enhanced-resolve@npm:^5.17.3":
version: 5.18.4
resolution: "enhanced-resolve@npm:5.18.4"
dependencies:
graceful-fs: "npm:^4.2.4"
tapable: "npm:^2.2.0"
checksum: 10c0/8f6d42c8a0787a746c493e724c9de5d091cfe8e3f871f2464e2f78a6c55fa1a3aaba495334f923c8ea3ac23e1472491f79feef6fc0fb46a75169cb447ffbe2dc
languageName: node
linkType: hard

"enquirer@npm:^2.3.6":
version: 2.4.1
resolution: "enquirer@npm:2.4.1"
Expand Down Expand Up @@ -12319,6 +12367,13 @@ __metadata:
languageName: node
linkType: hard

"loader-runner@npm:^4.3.1":
version: 4.3.1
resolution: "loader-runner@npm:4.3.1"
checksum: 10c0/a523b6329f114e0a98317158e30a7dfce044b731521be5399464010472a93a15ece44757d1eaed1d8845019869c5390218bc1c7c3110f4eeaef5157394486eac
languageName: node
linkType: hard

"loader-utils@npm:^1.0.2, loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3":
version: 1.4.2
resolution: "loader-utils@npm:1.4.2"
Expand Down Expand Up @@ -13348,6 +13403,13 @@ __metadata:
languageName: node
linkType: hard

"node-releases@npm:^2.0.27":
version: 2.0.27
resolution: "node-releases@npm:2.0.27"
checksum: 10c0/f1e6583b7833ea81880627748d28a3a7ff5703d5409328c216ae57befbced10ce2c991bea86434e8ec39003bd017f70481e2e5f8c1f7e0a7663241f81d6e00e2
languageName: node
linkType: hard

"node-watch@npm:0.7.3":
version: 0.7.3
resolution: "node-watch@npm:0.7.3"
Expand Down Expand Up @@ -14855,7 +14917,7 @@ __metadata:
vue-router: "npm:4.6.3"
vue-select: "npm:3.20.4"
vuex: "npm:4.1.0"
webpack: "npm:5.100.2"
webpack: "npm:5.103.0"
which: "npm:6.0.0"
yaml: "npm:2.8.2"
dependenciesMeta:
Expand Down Expand Up @@ -15477,6 +15539,18 @@ __metadata:
languageName: node
linkType: hard

"schema-utils@npm:^4.3.3":
version: 4.3.3
resolution: "schema-utils@npm:4.3.3"
dependencies:
"@types/json-schema": "npm:^7.0.9"
ajv: "npm:^8.9.0"
ajv-formats: "npm:^2.1.1"
ajv-keywords: "npm:^5.1.0"
checksum: 10c0/1c8d2c480a026d7c02ab2ecbe5919133a096d6a721a3f201fa50663e4f30f6d6ba020dfddd93cb828b66b922e76b342e103edd19a62c95c8f60e9079cc403202
languageName: node
linkType: hard

"select-hose@npm:^2.0.0":
version: 2.0.0
resolution: "select-hose@npm:2.0.0"
Expand Down Expand Up @@ -16329,6 +16403,13 @@ __metadata:
languageName: node
linkType: hard

"tapable@npm:^2.3.0":
version: 2.3.0
resolution: "tapable@npm:2.3.0"
checksum: 10c0/cb9d67cc2c6a74dedc812ef3085d9d681edd2c1fa18e4aef57a3c0605fdbe44e6b8ea00bd9ef21bc74dd45314e39d31227aa031ebf2f5e38164df514136f2681
languageName: node
linkType: hard

"tar-fs@npm:^3.0.9":
version: 3.1.1
resolution: "tar-fs@npm:3.1.1"
Expand Down Expand Up @@ -17155,6 +17236,20 @@ __metadata:
languageName: node
linkType: hard

"update-browserslist-db@npm:^1.2.0":
version: 1.2.3
resolution: "update-browserslist-db@npm:1.2.3"
dependencies:
escalade: "npm:^3.2.0"
picocolors: "npm:^1.1.1"
peerDependencies:
browserslist: ">= 4.21.0"
bin:
update-browserslist-db: cli.js
checksum: 10c0/13a00355ea822388f68af57410ce3255941d5fb9b7c49342c4709a07c9f230bbef7f7499ae0ca7e0de532e79a82cc0c4edbd125f1a323a1845bf914efddf8bec
languageName: node
linkType: hard

"uri-js@npm:^4.2.2":
version: 4.4.1
resolution: "uri-js@npm:4.4.1"
Expand Down Expand Up @@ -17400,6 +17495,16 @@ __metadata:
languageName: node
linkType: hard

"watchpack@npm:^2.4.4":
version: 2.4.4
resolution: "watchpack@npm:2.4.4"
dependencies:
glob-to-regexp: "npm:^0.4.1"
graceful-fs: "npm:^4.1.2"
checksum: 10c0/6c0901f75ce245d33991225af915eea1c5ae4ba087f3aee2b70dd377d4cacb34bef02a48daf109da9d59b2d31ec6463d924a0d72f8618ae1643dd07b95de5275
languageName: node
linkType: hard

"wbuf@npm:^1.1.0, wbuf@npm:^1.7.3":
version: 1.7.3
resolution: "wbuf@npm:1.7.3"
Expand Down Expand Up @@ -17551,7 +17656,45 @@ __metadata:
languageName: node
linkType: hard

"webpack@npm:5.100.2, webpack@npm:^5.54.0":
"webpack@npm:5.103.0":
version: 5.103.0
resolution: "webpack@npm:5.103.0"
dependencies:
"@types/eslint-scope": "npm:^3.7.7"
"@types/estree": "npm:^1.0.8"
"@types/json-schema": "npm:^7.0.15"
"@webassemblyjs/ast": "npm:^1.14.1"
"@webassemblyjs/wasm-edit": "npm:^1.14.1"
"@webassemblyjs/wasm-parser": "npm:^1.14.1"
acorn: "npm:^8.15.0"
acorn-import-phases: "npm:^1.0.3"
browserslist: "npm:^4.26.3"
chrome-trace-event: "npm:^1.0.2"
enhanced-resolve: "npm:^5.17.3"
es-module-lexer: "npm:^1.2.1"
eslint-scope: "npm:5.1.1"
events: "npm:^3.2.0"
glob-to-regexp: "npm:^0.4.1"
graceful-fs: "npm:^4.2.11"
json-parse-even-better-errors: "npm:^2.3.1"
loader-runner: "npm:^4.3.1"
mime-types: "npm:^2.1.27"
neo-async: "npm:^2.6.2"
schema-utils: "npm:^4.3.3"
tapable: "npm:^2.3.0"
terser-webpack-plugin: "npm:^5.3.11"
watchpack: "npm:^2.4.4"
webpack-sources: "npm:^3.3.3"
peerDependenciesMeta:
webpack-cli:
optional: true
bin:
webpack: bin/webpack.js
checksum: 10c0/d0cf86f8cac249874d6f36292e25011413ebb5bae82c48fa78a165a217e63db00b1a1f563f5195070eb17a055c6da4b6ab89fbdd37f781abdda862aa8c0bd623
languageName: node
linkType: hard

"webpack@npm:^5.54.0":
version: 5.100.2
resolution: "webpack@npm:5.100.2"
dependencies:
Expand Down
Loading