mirror of
https://github.com/wailsapp/wails.git
synced 2026-03-14 14:45:49 +01:00
Merge branch 'master' into bugfix/4109_restore_minimized_window
This commit is contained in:
commit
4228eab052
3 changed files with 19 additions and 15 deletions
2
.github/workflows/build-and-test-v3.yml
vendored
2
.github/workflows/build-and-test-v3.yml
vendored
|
|
@ -33,7 +33,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [warp-windows-latest-x64-2x, warp-macos-15-arm64-6x, warp-ubuntu-latest-x64-2x]
|
||||
os: [windows-latest, macos-latest, ubuntu-latest]
|
||||
go-version: [1.24]
|
||||
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ on:
|
|||
jobs:
|
||||
check_docs:
|
||||
name: Check Docs
|
||||
if: ${{github.repository == 'wailsapp/wails' && contains(github.head_ref,'feature/')}}
|
||||
if: ${{github.repository == 'wailsapp/wails' && github.base_ref == 'master'}}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
|
@ -55,7 +55,7 @@ jobs:
|
|||
test_go:
|
||||
name: Run Go Tests
|
||||
runs-on: ${{ matrix.os }}
|
||||
if: github.event.review.state == 'approved'
|
||||
if: github.event.review.state == 'approved' && github.repository == 'wailsapp/wails' && github.base_ref == 'master'
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04]
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 244 KiB After Width: | Height: | Size: 248 KiB |
Loading…
Add table
Add a link
Reference in a new issue