Skip to content
Open
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
23 changes: 22 additions & 1 deletion .github/workflows/go-work-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- '**/go.mod'
- '**/go.sum'
- 'go.work'
workflow_dispatch:
permissions:
contents: write
concurrency:
Expand Down Expand Up @@ -39,7 +40,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 @@ -134,7 +134,7 @@
"css-loader": "7.1.2",
"ejs": "3.1.10",
"electron": "39.2.6",
"electron-builder": "26.2.0",
"electron-builder": "26.3.6",
"eslint": "9.39.1",
"eslint-plugin-vue": "10.6.2",
"extract-zip": "2.0.1",
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
101 changes: 44 additions & 57 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6684,9 +6684,9 @@ __metadata:
languageName: node
linkType: hard

"app-builder-lib@npm:26.2.0":
version: 26.2.0
resolution: "app-builder-lib@npm:26.2.0"
"app-builder-lib@npm:26.3.6":
version: 26.3.6
resolution: "app-builder-lib@npm:26.3.6"
dependencies:
"@develar/schema-utils": "npm:~2.6.5"
"@electron/asar": "npm:3.4.1"
Expand All @@ -6698,15 +6698,15 @@ __metadata:
"@malept/flatpak-bundler": "npm:^0.4.0"
"@types/fs-extra": "npm:9.0.13"
async-exit-hook: "npm:^2.0.1"
builder-util: "npm:26.1.0"
builder-util-runtime: "npm:9.5.0"
builder-util: "npm:26.3.4"
builder-util-runtime: "npm:9.5.1"
chromium-pickle-js: "npm:^0.2.0"
ci-info: "npm:^4.2.0"
ci-info: "npm:4.3.1"
debug: "npm:^4.3.4"
dotenv: "npm:^16.4.5"
dotenv-expand: "npm:^11.0.6"
ejs: "npm:^3.1.8"
electron-publish: "npm:26.1.0"
electron-publish: "npm:26.3.4"
fs-extra: "npm:^10.1.0"
hosted-git-info: "npm:^4.1.0"
isbinaryfile: "npm:^5.0.0"
Expand All @@ -6717,15 +6717,15 @@ __metadata:
minimatch: "npm:^10.0.3"
plist: "npm:3.1.0"
resedit: "npm:^1.7.0"
semver: "npm:7.7.2"
semver: "npm:~7.7.3"
tar: "npm:^6.1.12"
temp-file: "npm:^3.4.0"
tiny-async-pool: "npm:1.3.0"
which: "npm:^5.0.0"
peerDependencies:
dmg-builder: 26.2.0
electron-builder-squirrel-windows: 26.2.0
checksum: 10c0/81fba154eab87837c0a1cc156a0f5db5ffa06cb78a905aff2a8f4c35aca4dba3e361cf835d1a8df4eef3819f6c93d4be3163cd7901b0c63b4bef7c691f1794ad
dmg-builder: 26.3.6
electron-builder-squirrel-windows: 26.3.6
checksum: 10c0/33ce82f9cb13770eeb715ec342203603029470ab450ea54b4875f92de238a9c0d94d4d772fbd023278c50075cd210a1a24dc15eebda0b699a7f51aea470f2f70
languageName: node
linkType: hard

Expand Down Expand Up @@ -7290,16 +7290,6 @@ __metadata:
languageName: node
linkType: hard

"builder-util-runtime@npm:9.5.0":
version: 9.5.0
resolution: "builder-util-runtime@npm:9.5.0"
dependencies:
debug: "npm:^4.3.4"
sax: "npm:^1.2.4"
checksum: 10c0/797f4f8129557de6f5699991974f1701e464646664a14f841870fca0ddb05cb63cb8f2ca3c082cd6215690048c5e12df8404e7ccec371640eed9edc8cb592ae6
languageName: node
linkType: hard

"builder-util-runtime@npm:9.5.1":
version: 9.5.1
resolution: "builder-util-runtime@npm:9.5.1"
Expand All @@ -7310,16 +7300,15 @@ __metadata:
languageName: node
linkType: hard

"builder-util@npm:26.1.0":
version: 26.1.0
resolution: "builder-util@npm:26.1.0"
"builder-util@npm:26.3.4":
version: 26.3.4
resolution: "builder-util@npm:26.3.4"
dependencies:
7zip-bin: "npm:~5.2.0"
"@types/debug": "npm:^4.1.6"
app-builder-bin: "npm:5.0.0-alpha.12"
builder-util-runtime: "npm:9.5.0"
builder-util-runtime: "npm:9.5.1"
chalk: "npm:^4.1.2"
ci-info: "npm:^4.2.0"
cross-spawn: "npm:^7.0.6"
debug: "npm:^4.3.4"
fs-extra: "npm:^10.1.0"
Expand All @@ -7331,7 +7320,7 @@ __metadata:
stat-mode: "npm:^1.0.0"
temp-file: "npm:^3.4.0"
tiny-async-pool: "npm:1.3.0"
checksum: 10c0/0e1bcc04452cda8eaa1d63f338e05c1280f0539ee9dd7a9d4d17f75dff323d0d34de184fc146e3bdb1e1f1578bc0070569b1701312b509e802c97bfe4fed24b1
checksum: 10c0/1515eb96d2df2d2340fbf7966ad1bcf459c4f843608f4583513a1064f4d85f0400f763b9f5851e715f02ac736e36a6b3337f810eafa0e88fec82aa4212885579
languageName: node
linkType: hard

Expand Down Expand Up @@ -7586,6 +7575,13 @@ __metadata:
languageName: node
linkType: hard

"ci-info@npm:4.3.1":
version: 4.3.1
resolution: "ci-info@npm:4.3.1"
checksum: 10c0/7dd82000f514d76ddfe7775e4cb0d66e5c638f5fa0e2a3be29557e898da0d32ac04f231217d414d07fb968b1fbc6d980ee17ddde0d2c516f23da9cfff608f6c1
languageName: node
linkType: hard

"ci-info@npm:^2.0.0":
version: 2.0.0
resolution: "ci-info@npm:2.0.0"
Expand Down Expand Up @@ -8609,20 +8605,20 @@ __metadata:
languageName: node
linkType: hard

"dmg-builder@npm:26.2.0":
version: 26.2.0
resolution: "dmg-builder@npm:26.2.0"
"dmg-builder@npm:26.3.6":
version: 26.3.6
resolution: "dmg-builder@npm:26.3.6"
dependencies:
app-builder-lib: "npm:26.2.0"
builder-util: "npm:26.1.0"
app-builder-lib: "npm:26.3.6"
builder-util: "npm:26.3.4"
dmg-license: "npm:^1.0.11"
fs-extra: "npm:^10.1.0"
iconv-lite: "npm:^0.6.2"
js-yaml: "npm:^4.1.0"
dependenciesMeta:
dmg-license:
optional: true
checksum: 10c0/9c7b0c5626ae47e7ee33f9d3754ade8f28ca25ef5a1acaa9e9d3c096ab52601d454ef49ad9746f955475628c27e988b67afa8cadf7cc9b4a0adda0662ca475fc
checksum: 10c0/fe71577f229c8978bf721ab7a877a46d62a9c62456be64191c2d10bdd02b3cf98d277787acbb8ceb540705009017a7e5ed28a14e2d818cf5c7df1e10d931bb65
languageName: node
linkType: hard

Expand Down Expand Up @@ -8821,40 +8817,40 @@ __metadata:
languageName: node
linkType: hard

"electron-builder@npm:26.2.0":
version: 26.2.0
resolution: "electron-builder@npm:26.2.0"
"electron-builder@npm:26.3.6":
version: 26.3.6
resolution: "electron-builder@npm:26.3.6"
dependencies:
app-builder-lib: "npm:26.2.0"
builder-util: "npm:26.1.0"
builder-util-runtime: "npm:9.5.0"
app-builder-lib: "npm:26.3.6"
builder-util: "npm:26.3.4"
builder-util-runtime: "npm:9.5.1"
chalk: "npm:^4.1.2"
ci-info: "npm:^4.2.0"
dmg-builder: "npm:26.2.0"
dmg-builder: "npm:26.3.6"
fs-extra: "npm:^10.1.0"
lazy-val: "npm:^1.0.5"
simple-update-notifier: "npm:2.0.0"
yargs: "npm:^17.6.2"
bin:
electron-builder: cli.js
install-app-deps: install-app-deps.js
checksum: 10c0/bc35fe4cb7651d517c8d75b1d9cf2d571ba1260d33cb19753847b7d766ad1f43d4c287329d9686cac77912cad9a6455657a179dfb923ba69040b77f820f21fb8
checksum: 10c0/84736d0646d8e4ddf3f0ad524782faa93b8047be0ac0e4f0e780c170f9601759010d759c59afc8822fca3720ec5944ed835475b423a40ca9206b4130a623fc4f
languageName: node
linkType: hard

"electron-publish@npm:26.1.0":
version: 26.1.0
resolution: "electron-publish@npm:26.1.0"
"electron-publish@npm:26.3.4":
version: 26.3.4
resolution: "electron-publish@npm:26.3.4"
dependencies:
"@types/fs-extra": "npm:^9.0.11"
builder-util: "npm:26.1.0"
builder-util-runtime: "npm:9.5.0"
builder-util: "npm:26.3.4"
builder-util-runtime: "npm:9.5.1"
chalk: "npm:^4.1.2"
form-data: "npm:^4.0.0"
fs-extra: "npm:^10.1.0"
lazy-val: "npm:^1.0.5"
mime: "npm:^2.5.2"
checksum: 10c0/f6593e007f47bea311ab9678c31f724a3c0826de4e0f8ea917d4c3d073d3470ede6a093b51408cd53dd790bb1baa4d5b7647a8cd935d0ff3b4d011050e861f0b
checksum: 10c0/8a05f601a6bf281d40f35c52920150aa608901efc276efa90f32373ed303ba2f5ca7d93a4d063283206cc39da18b70a28c9c256d3e243a44aaabd9e703f19031
languageName: node
linkType: hard

Expand Down Expand Up @@ -14808,7 +14804,7 @@ __metadata:
dompurify: "npm:3.3.1"
ejs: "npm:3.1.10"
electron: "npm:39.2.6"
electron-builder: "npm:26.2.0"
electron-builder: "npm:26.3.6"
electron-updater: "npm:6.7.3"
eslint: "npm:9.39.1"
eslint-plugin-vue: "npm:10.6.2"
Expand Down Expand Up @@ -15510,15 +15506,6 @@ __metadata:
languageName: node
linkType: hard

"semver@npm:7.7.2":
version: 7.7.2
resolution: "semver@npm:7.7.2"
bin:
semver: bin/semver.js
checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea
languageName: node
linkType: hard

"semver@npm:7.7.3, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3, semver@npm:^7.7.1, semver@npm:^7.7.2, semver@npm:^7.7.3, semver@npm:~7.7.3":
version: 7.7.3
resolution: "semver@npm:7.7.3"
Expand Down
Loading