Skip to content

Commit 250c9c8

Browse files
authored
Merge branch 'v3-alpha' into patch-2
2 parents a60f201 + ae4ed4f commit 250c9c8

24 files changed

Lines changed: 1104 additions & 718 deletions

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -223,23 +223,23 @@ jobs:
223223
cd ${{ matrix.template }}
224224
wails3 build
225225
226-
results:
227-
if: ${{ always() }}
228-
runs-on: ubuntu-latest
229-
name: v3 Build Results
230-
needs: [test_go, test_js, test_templates]
231-
steps:
232-
- run: |
233-
go_result="${{ needs.test_go.result }}"
234-
js_result="${{ needs.test_js.result }}"
235-
templates_result="${{ needs.test_templates.result }}"
236-
237-
if [[ $go_result == "success" || $go_result == "skipped" ]] && \
238-
[[ $js_result == "success" || $js_result == "skipped" ]] && \
239-
[[ $templates_result == "success" || $templates_result == "skipped" ]]; then
240-
echo "All required jobs succeeded or were skipped"
241-
exit 0
242-
else
243-
echo "One or more required jobs failed"
244-
exit 1
245-
fi
226+
build_results:
227+
if: ${{ always() }}
228+
runs-on: ubuntu-latest
229+
name: v3 Build Results
230+
needs: [test_go, test_js, test_templates]
231+
steps:
232+
- run: |
233+
go_result="${{ needs.test_go.result }}"
234+
js_result="${{ needs.test_js.result }}"
235+
templates_result="${{ needs.test_templates.result }}"
236+
237+
if [[ $go_result == "success" || $go_result == "skipped" ]] && \
238+
[[ $js_result == "success" || $js_result == "skipped" ]] && \
239+
[[ $templates_result == "success" || $templates_result == "skipped" ]]; then
240+
echo "All required jobs succeeded or were skipped"
241+
exit 0
242+
else
243+
echo "One or more required jobs failed"
244+
exit 1
245+
fi

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ jobs:
2929
with:
3030
commit-message: "chore: update sponsors.svg"
3131
add-paths: "website/static/img/sponsors.svg"
32-
title: Update Sponsor Image
33-
body: Generated new image
32+
title: "chore: update sponsors.svg"
33+
body: |
34+
Auto-generated by the sponsor image workflow
35+
36+
[skip ci] [skip actions]
3437
branch: update-sponsors
38+
base: master
3539
delete-branch: true
40+
draft: false
Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: PR Checks
1+
name: PR Checks (master)
22

33
on:
44
pull_request:
@@ -29,33 +29,14 @@ jobs:
2929
run: |
3030
echo "::warning::Feature branch does not contain any changes to the website."
3131
32-
# lint_go:
33-
# name: Run Go Linters
34-
# runs-on: ubuntu-latest
35-
# steps:
36-
# - name: Checkout code
37-
# uses: actions/checkout@v4
38-
#
39-
# - name: Setup Go
40-
# uses: actions/setup-go@v4
41-
# with:
42-
# go-version: "1.21"
43-
#
44-
# - name: Update go modules
45-
# working-directory: ./v2
46-
# run: go mod tidy
47-
#
48-
# - name: Run Linter
49-
# uses: golangci/golangci-lint-action@v3
50-
# with:
51-
# version: v1.54
52-
# working-directory: ./v2
53-
# args: --timeout=10m0s --config ./.golangci.yml
54-
5532
test_go:
5633
name: Run Go Tests
5734
runs-on: ${{ matrix.os }}
58-
if: github.event.review.state == 'approved' && github.repository == 'wailsapp/wails' && github.base_ref == 'master'
35+
if: >
36+
github.event.review.state == 'approved' &&
37+
github.repository == 'wailsapp/wails' &&
38+
github.base_ref == 'master' &&
39+
github.event.pull_request.head.ref != 'update-sponsors'
5940
strategy:
6041
matrix:
6142
os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04]
@@ -65,11 +46,11 @@ jobs:
6546
- name: Checkout code
6647
uses: actions/checkout@v3
6748

68-
- name: Install linux dependencies ( 22.04 )
49+
- name: Install linux dependencies (22.04)
6950
if: matrix.os == 'ubuntu-22.04'
7051
run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config
7152

72-
- name: Install linux dependencies ( 24.04 )
53+
- name: Install linux dependencies (24.04)
7354
if: matrix.os == 'ubuntu-24.04'
7455
run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config
7556

0 commit comments

Comments
 (0)