Skip to content

Commit 7ced9f9

Browse files
authored
Merge branch 'master' into dependabot/go_modules/v3/examples/gin-example/go_modules-ec38730807
2 parents 44e87a9 + ee0fdbf commit 7ced9f9

974 files changed

Lines changed: 45404 additions & 16356 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coderabbit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ reviews:
2121
ignore_title_keywords: []
2222
labels: []
2323
drafts: false
24-
base_branches: ['v3-alpha', 'master']
24+
base_branches: ['master']
2525
tools:
2626
shellcheck:
2727
enabled: true

.fossa.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ version: 3
77
# site locally; it is not distributed with the Wails Go module or the
88
# @wailsio/runtime npm package, so it is out of scope for the license
99
# compliance posture we want FOSSA to enforce.
10+
# Example-app frontends are demo/development tooling; they are not
11+
# distributed as part of the Wails Go module or @wailsio/runtime and
12+
# are excluded to keep the compliance posture focused on distributed
13+
# artifacts.
1014
#
1115
# The Astro-based docs site (docs/) carries the same pattern: sharp pulls in
1216
# @img/sharp-libvips-* (LGPL-3.0-or-later) and astro-d2 pulls in
@@ -16,5 +20,7 @@ targets:
1620
exclude:
1721
- type: npm
1822
path: website
23+
- type: npm
24+
path: v3/examples
1925
- type: npm
2026
path: docs

.github/workflows/auto-changelog-v3.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ jobs:
2020

2121
permissions:
2222
contents: write
23+
pull-requests: read # GET /pulls/{n} and /pulls/{n}/files
24+
issues: read # GET /issues/{n}/comments (CodeRabbit summary)
2325

2426
steps:
25-
- name: Checkout v3-alpha
27+
- name: Checkout master
2628
uses: actions/checkout@v4
2729
with:
2830
ref: master
2931
fetch-depth: 0
30-
token: ${{ secrets.CHANGELOG_PUSH_TOKEN || secrets.GITHUB_TOKEN }}
32+
token: ${{ secrets.WAILS_REPO_TOKEN || secrets.GITHUB_TOKEN }}
3133

3234
- name: Resolve PR number
3335
id: pr
@@ -81,5 +83,11 @@ jobs:
8183
git config user.name "github-actions[bot]"
8284
git config user.email "github-actions[bot]@users.noreply.github.com"
8385
git add v3/UNRELEASED_CHANGELOG.md
86+
# The auto-fill step intentionally writes nothing for internal-only PRs
87+
# (ci/chore/build/test/style). Skip cleanly so the merge doesn't go red.
88+
if git diff --cached --quiet; then
89+
echo "ℹ️ No changelog entry to commit (internal PR or no change) — skipping."
90+
exit 0
91+
fi
8492
git commit -m "chore(changelog): auto-add entry for PR #${PR_NUMBER} — ${PR_TITLE}"
85-
git push https://x-access-token:${{ secrets.CHANGELOG_PUSH_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git master
93+
git push https://x-access-token:${{ secrets.WAILS_REPO_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git master

.github/workflows/build-and-test-v3.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- master
88
paths:
99
- 'v3/**'
10+
- 'webview2/**'
11+
- 'go.work'
12+
- 'go.work.sum'
1013
- '.github/workflows/build-and-test-v3.yml'
1114
pull_request_review:
1215
types: [submitted]
@@ -95,8 +98,6 @@ jobs:
9598
runs-on: ${{ matrix.os }}
9699
if: github.base_ref == 'master'
97100
timeout-minutes: 25
98-
env:
99-
GOWORK: "off"
100101
strategy:
101102
fail-fast: false
102103
matrix:
@@ -126,7 +127,10 @@ jobs:
126127
with:
127128
go-version: ${{ matrix.go-version }}
128129
cache: true
129-
cache-dependency-path: "v3/go.sum"
130+
cache-dependency-path: |
131+
v3/go.sum
132+
webview2/go.sum
133+
go.work.sum
130134
131135
- name: Install Task
132136
uses: arduino/setup-task@v2
@@ -200,25 +204,19 @@ jobs:
200204
needs: [test_js, test_go]
201205
runs-on: ${{ matrix.os }}
202206
if: github.base_ref == 'master'
203-
env:
204-
GOWORK: "off"
205207
strategy:
206208
fail-fast: false
207209
matrix:
208210
os: [ubuntu-latest, windows-latest, macos-latest]
209211
template:
210-
- svelte
211-
- svelte-ts
212-
- vue
213-
- vue-ts
214-
- react
215-
- react-ts
216-
- preact
217-
- preact-ts
218-
- lit
219-
- lit-ts
220212
- vanilla
221-
- vanilla-ts
213+
- vanilla-js
214+
- react
215+
- react-js
216+
- vue
217+
- vue-js
218+
- svelte
219+
- svelte-js
222220
go-version: [1.25]
223221
steps:
224222
- name: Checkout
@@ -243,7 +241,10 @@ jobs:
243241
with:
244242
go-version: ${{ matrix.go-version }}
245243
cache: true
246-
cache-dependency-path: "v3/go.sum"
244+
cache-dependency-path: |
245+
v3/go.sum
246+
webview2/go.sum
247+
go.work.sum
247248
248249
- name: Install Task
249250
uses: arduino/setup-task@v2
@@ -279,6 +280,9 @@ jobs:
279280
# Replace @wailsio/runtime version with local tarball
280281
npm pkg set dependencies.@wailsio/runtime="file://$RUNTIME_TGZ"
281282
cd ..
283+
# Register the generated project in the workspace so Go 1.25 workspace
284+
# mode does not reject packages in a module not listed in go.work.
285+
go work use .
282286
wails3 build
283287
284288
# GTK3 legacy template builds are covered by the Go example compilation tests above.

.github/workflows/build-cross-image.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,21 @@ on:
3030
paths:
3131
- 'v3/internal/commands/build_assets/docker/Dockerfile.cross'
3232

33+
permissions:
34+
contents: read
35+
3336
env:
3437
REGISTRY: ghcr.io
3538
IMAGE_NAME: wailsapp/wails-cross
3639

3740
jobs:
3841
build:
3942
runs-on: ubuntu-latest
40-
env:
41-
GOWORK: "off"
4243
permissions:
4344
contents: read
4445
packages: write
46+
env:
47+
GOWORK: "off"
4548
outputs:
4649
image_tag: ${{ steps.vars.outputs.image_version }}
4750

@@ -114,6 +117,9 @@ jobs:
114117
runs-on: ubuntu-latest
115118
env:
116119
GOWORK: "off"
120+
permissions:
121+
contents: read
122+
packages: read
117123
strategy:
118124
fail-fast: false
119125
matrix:

.github/workflows/bump-webview2-v3.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/changelog-v3.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
fetch-depth: 0
3131
token: ${{ secrets.GITHUB_TOKEN || github.token }}
3232

33-
- name: Get REAL validation script from v3-alpha
33+
- name: Get validation script from master
3434
run: |
35-
echo "Fetching the REAL validation script from v3-alpha branch..."
35+
echo "Fetching the validation script from master branch..."
3636
git fetch origin master
3737
git checkout origin/master -- v3/scripts/validate-changelog.go
3838
@@ -121,9 +121,9 @@ jobs:
121121
echo "🔍 PR source branch: $BRANCH_NAME"
122122
echo "🔍 Head repository: $HEAD_REPO"
123123
124-
# Don't push if this is from a fork or if branch is v3-alpha (main branch)
124+
# Don't push if this is from a fork or if branch is master (main branch)
125125
if [ "$HEAD_REPO" != "wails" ] || [ "$BRANCH_NAME" = "master" ]; then
126-
echo "⚠️ Cannot push - either fork or direct v3-alpha branch. Manual fix required."
126+
echo "⚠️ Cannot push - either fork or master branch. Manual fix required."
127127
echo "committed=false" >> $GITHUB_OUTPUT
128128
exit 0
129129
fi

.github/workflows/cross-compile-test-v3.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- master
88
paths:
99
- 'v3/**'
10+
- 'webview2/**'
11+
- 'go.work'
12+
- 'go.work.sum'
1013
- '.github/workflows/cross-compile-test-v3.yml'
1114
workflow_dispatch:
1215
inputs:
@@ -77,7 +80,10 @@ jobs:
7780
with:
7881
go-version: '1.25'
7982
cache: true
80-
cache-dependency-path: "v3/go.sum"
83+
cache-dependency-path: |
84+
v3/go.sum
85+
webview2/go.sum
86+
go.work.sum
8187
8288
- name: Install Task
8389
uses: arduino/setup-task@v2

.github/workflows/generate-sponsor-image.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,34 @@ jobs:
1010
name: Update Sponsors
1111
runs-on: ubuntu-latest
1212
if: github.repository == 'wailsapp/wails'
13+
permissions:
14+
contents: write
1315
steps:
14-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
17+
with:
18+
# Use the bypass-capable token so the auto-commit can push directly
19+
# to the protected master branch (same pattern as publish-npm.yml).
20+
token: ${{ secrets.WAILS_REPO_TOKEN || github.token }}
1521

1622
- name: Set Node
17-
uses: actions/setup-node@v2
23+
uses: actions/setup-node@v4
1824
with:
19-
node-version: 20.x
25+
node-version: "22"
2026

2127
- name: Update Sponsors
2228
run: cd scripts/sponsors && chmod 755 ./generate-sponsor-image.sh && ./generate-sponsor-image.sh
2329
env:
2430
SPONSORKIT_GITHUB_TOKEN: ${{ secrets.SPONSORS_TOKEN }}
2531
SPONSORKIT_GITHUB_LOGIN: wailsapp
2632

27-
- name: Create Pull Request
28-
uses: peter-evans/create-pull-request@v6
29-
with:
30-
commit-message: "chore: update sponsors.svg"
31-
add-paths: "website/static/img/sponsors.svg"
32-
title: "chore: update sponsors.svg"
33-
body: |
34-
Auto-generated by the sponsor image workflow
35-
36-
[skip ci] [skip actions]
37-
branch: update-sponsors
38-
base: master
39-
delete-branch: true
40-
draft: false
33+
- name: Commit updated sponsor image
34+
run: |
35+
git config user.name "github-actions[bot]"
36+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
37+
if git diff --quiet -- website/static/img/sponsors.svg; then
38+
echo "No sponsor changes to commit."
39+
exit 0
40+
fi
41+
git add website/static/img/sponsors.svg
42+
git commit -m "chore: update sponsors.svg [skip ci]"
43+
git push

0 commit comments

Comments
 (0)