Skip to content

Commit 2ef15be

Browse files
authored
Merge branch 'master' into agent/engineer-linux/a97ce245
2 parents 5340f7c + bc7d224 commit 2ef15be

772 files changed

Lines changed: 129731 additions & 3084 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.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
auto-changelog:
1616
if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
1717
runs-on: ubuntu-latest
18+
env:
19+
GOWORK: "off"
1820

1921
permissions:
2022
contents: write

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ jobs:
9595
runs-on: ${{ matrix.os }}
9696
if: github.base_ref == 'master'
9797
timeout-minutes: 25
98+
env:
99+
GOWORK: "off"
98100
strategy:
99101
fail-fast: false
100102
matrix:
@@ -198,6 +200,8 @@ jobs:
198200
needs: [test_js, test_go]
199201
runs-on: ${{ matrix.os }}
200202
if: github.base_ref == 'master'
203+
env:
204+
GOWORK: "off"
201205
strategy:
202206
fail-fast: false
203207
matrix:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
name: Run Go Tests
1414
if: github.repository == 'wailsapp/wails'
1515
runs-on: ${{ matrix.os }}
16+
env:
17+
GOWORK: "off"
1618
strategy:
1719
matrix:
1820
os: [ubuntu-22.04, ubuntu-24.04, windows-latest, macos-latest]
@@ -86,6 +88,8 @@ jobs:
8688
name: Test Templates
8789
needs: test_go
8890
runs-on: ${{ matrix.os }}
91+
env:
92+
GOWORK: "off"
8993
strategy:
9094
fail-fast: true
9195
matrix:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ env:
3737
jobs:
3838
build:
3939
runs-on: ubuntu-latest
40+
env:
41+
GOWORK: "off"
4042
permissions:
4143
contents: read
4244
packages: write
@@ -110,6 +112,8 @@ jobs:
110112
needs: build
111113
if: ${{ inputs.skip_tests != 'true' }}
112114
runs-on: ubuntu-latest
115+
env:
116+
GOWORK: "off"
113117
strategy:
114118
fail-fast: false
115119
matrix:
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Bump webview2 in v3
2+
3+
on:
4+
repository_dispatch:
5+
types: [bump-webview2-v3]
6+
workflow_dispatch:
7+
inputs:
8+
version:
9+
description: 'webview2 version to bump to (e.g., v1.0.24)'
10+
required: true
11+
type: string
12+
13+
permissions:
14+
contents: write
15+
pull-requests: write
16+
17+
jobs:
18+
bump:
19+
runs-on: ubuntu-latest
20+
env:
21+
GOWORK: "off"
22+
23+
steps:
24+
- name: Checkout code
25+
uses: actions/checkout@v4
26+
27+
- name: Setup Go
28+
uses: actions/setup-go@v5
29+
with:
30+
go-version: '1.25'
31+
cache: true
32+
cache-dependency-path: "v3/go.sum"
33+
34+
- name: Determine version
35+
id: version
36+
run: |
37+
if [ "${{ github.event_name }}" = "repository_dispatch" ]; then
38+
VERSION="${{ github.event.client_payload.version }}"
39+
else
40+
VERSION="${{ inputs.version }}"
41+
fi
42+
echo "version=$VERSION" >> $GITHUB_OUTPUT
43+
echo "Bumping webview2 to version: $VERSION"
44+
45+
- name: Update v3 go.mod
46+
working-directory: v3
47+
run: |
48+
go get github.com/wailsapp/wails/webview2@${{ steps.version.outputs.version }}
49+
go mod tidy
50+
51+
- name: Create pull request
52+
uses: peter-evans/create-pull-request@v6
53+
with:
54+
token: ${{ secrets.GITHUB_TOKEN }}
55+
branch: bump/webview2-${{ steps.version.outputs.version }}
56+
title: "chore(v3): bump webview2 to ${{ steps.version.outputs.version }}"
57+
body: |
58+
Bumps webview2 to version ${{ steps.version.outputs.version }}
59+
60+
Triggered by release-webview2 workflow.
61+
commit-message: "chore(v3): bump webview2 to ${{ steps.version.outputs.version }}"
62+
labels: dependencies, v3

.github/workflows/changelog-v3.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ on:
1515
jobs:
1616
validate:
1717
runs-on: ubuntu-latest
18+
env:
19+
GOWORK: "off"
1820
permissions:
1921
contents: write
2022
pull-requests: write

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
needs: check_approval
3939
runs-on: ${{ matrix.runner }}
4040
if: needs.check_approval.outputs.approved == 'true'
41+
env:
42+
GOWORK: "off"
4143
strategy:
4244
fail-fast: false
4345
matrix:

.github/workflows/nightly-release-v3.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ on:
1919
jobs:
2020
nightly-release:
2121
runs-on: ubuntu-latest
22+
env:
23+
GOWORK: "off"
2224

2325
permissions:
2426
contents: write

.github/workflows/pr-master.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
workflow_dispatch: {}
1111

1212
name: PR Checks (master)
13+
permissions:
14+
contents: read
1315

1416
jobs:
1517
check_docs:
@@ -52,6 +54,8 @@ jobs:
5254
)
5355
)
5456
)
57+
env:
58+
GOWORK: "off"
5559
strategy:
5660
matrix:
5761
os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04]
@@ -98,6 +102,25 @@ jobs:
98102
working-directory: ./v2
99103
run: go test -v -tags webkit2_41 ./...
100104

105+
# Gate job: provides the bare "Run Go Tests" check name that branch protection requires.
106+
# The matrix job above posts "Run Go Tests (os, version)" per platform; this job
107+
# aggregates those results under the exact name the rule expects.
108+
test_go_gate:
109+
name: Run Go Tests
110+
runs-on: ubuntu-latest
111+
needs: [test_go]
112+
if: always()
113+
steps:
114+
- name: Check matrix result
115+
run: |
116+
result="${{ needs.test_go.result }}"
117+
if [[ "$result" == "success" || "$result" == "skipped" ]]; then
118+
echo "Go tests result: $result — gate passed"
119+
else
120+
echo "Go tests result: $result — gate failed"
121+
exit 1
122+
fi
123+
101124
# This job will run instead of test_go for the update-sponsors branch
102125
skip_tests:
103126
name: Skip Tests (Sponsor Update)
@@ -109,3 +132,47 @@ jobs:
109132
echo "Skipping tests for sponsor update branch"
110133
echo "This is an automated update of the sponsors image."
111134
continue-on-error: true
135+
136+
# Aggregate job that satisfies the "Run Go Tests" branch protection required check.
137+
# Matrix jobs report as "Run Go Tests (os, version)" — no single check with the bare
138+
# name is ever posted, so the requirement is never fulfilled without this fan-in job.
139+
go_test_results:
140+
name: Run Go Tests
141+
if: >
142+
always() &&
143+
github.repository == 'wailsapp/wails' &&
144+
(
145+
github.event.pull_request.head.ref == 'update-sponsors' ||
146+
(
147+
github.event.pull_request.head.ref != 'update-sponsors' &&
148+
(
149+
github.event_name == 'workflow_dispatch' ||
150+
(
151+
github.event.pull_request.base.ref == 'master' &&
152+
(
153+
github.event_name == 'pull_request' ||
154+
(github.event_name == 'pull_request_review' && github.event.review.state == 'approved')
155+
)
156+
)
157+
)
158+
)
159+
)
160+
needs: [test_go, skip_tests]
161+
runs-on: ubuntu-latest
162+
steps:
163+
- run: |
164+
test_result="${{ needs.test_go.result }}"
165+
skip_result="${{ needs.skip_tests.result }}"
166+
branch="${{ github.event.pull_request.head.ref }}"
167+
168+
if [[ "$test_result" == "success" ]]; then
169+
exit 0
170+
fi
171+
172+
if [[ "$branch" == "update-sponsors" && "$skip_result" == "success" ]]; then
173+
exit 0
174+
fi
175+
176+
echo "Go tests result: $test_result"
177+
echo "Skip tests result: $skip_result"
178+
exit 1
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
name: Release webview2
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Version to release (e.g., v1.0.24). Leave empty to auto-increment.'
8+
required: false
9+
type: string
10+
11+
permissions:
12+
contents: write
13+
14+
jobs:
15+
release:
16+
runs-on: ubuntu-latest
17+
env:
18+
GOWORK: "off"
19+
20+
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0
25+
26+
- name: Setup Go
27+
uses: actions/setup-go@v5
28+
with:
29+
go-version: '1.25'
30+
cache: true
31+
cache-dependency-path: "webview2/go.sum"
32+
33+
- name: Determine next version
34+
id: version
35+
run: |
36+
if [ -n "${{ inputs.version }}" ]; then
37+
VERSION="${{ inputs.version }}"
38+
else
39+
# Auto-increment patch from last webview2/v* tag
40+
LAST_TAG=$(git tag -l "webview2/v*" | sort -V | tail -n 1)
41+
if [ -z "$LAST_TAG" ]; then
42+
VERSION="v1.0.24"
43+
else
44+
# Extract version number without webview2/ prefix
45+
LAST_VERSION=${LAST_TAG#webview2/}
46+
# Increment patch version
47+
MAJOR=$(echo $LAST_VERSION | cut -d. -f1)
48+
MINOR=$(echo $LAST_VERSION | cut -d. -f2)
49+
PATCH=$(echo $LAST_VERSION | cut -d. -f3)
50+
PATCH=$((PATCH + 1))
51+
VERSION="v${MAJOR}.${MINOR}.${PATCH}"
52+
fi
53+
fi
54+
55+
echo "version=$VERSION" >> $GITHUB_OUTPUT
56+
echo "Releasing webview2 at version: $VERSION"
57+
58+
- name: Build and test webview2
59+
working-directory: webview2
60+
run: |
61+
echo "Building webview2..."
62+
go build ./...
63+
go test ./...
64+
65+
- name: Create and push tag
66+
run: |
67+
git config user.name "github-actions[bot]"
68+
git config user.email "github-actions[bot]@users.noreply.github.com"
69+
git tag -a "webview2/${{ steps.version.outputs.version }}" -m "Release webview2 ${{ steps.version.outputs.version }}"
70+
git push origin "webview2/${{ steps.version.outputs.version }}"
71+
72+
- name: Create GitHub release
73+
uses: actions/create-release@v1
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
with:
77+
tag_name: webview2/${{ steps.version.outputs.version }}
78+
release_name: webview2 ${{ steps.version.outputs.version }}
79+
body: |
80+
Release of webview2 ${{ steps.version.outputs.version }}
81+
draft: false
82+
prerelease: false
83+
latest: false
84+
85+
- name: Trigger bump workflow
86+
uses: peter-evans/repository-dispatch@v2
87+
with:
88+
token: ${{ secrets.GITHUB_TOKEN }}
89+
event-type: bump-webview2-v3
90+
client-payload:
91+
version: ${{ steps.version.outputs.version }}

0 commit comments

Comments
 (0)