github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-14 07:59:30 +08:00
Code Projects Activity

Merge branch 'v3-alpha' into v3-alpha

Browse Source
This commit is contained in:
Lea Anthony 2025-03-08 11:54:03 +11:00 committed by GitHub
commit abd27b285e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-and-test-v3.yml vendored
View File

@ -91,7 +91,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [warp-windows-latest-x64-2x, warp-macos-15-arm64-6x, warp-ubuntu-latest-x64-2x] os: [windows-latest, ubuntu-latest, macos-latest]
go-version: [1.24] go-version: [1.24]
steps: steps:

7
.github/workflows/pr.yml → .github/workflows/pr-v3.yml vendored
View File

@ -8,11 +8,10 @@ on:
types: [submitted] types: [submitted]
branches: branches:
- master - master
jobs: jobs:
check_docs: check_docs:
name: 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 runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -56,11 +55,11 @@ jobs:
test_go: test_go:
name: Run Go Tests name: Run Go Tests
runs-on: ${{ matrix.os }} 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: strategy:
matrix: matrix:
os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04] os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04]
go-version: ['1.21'] go-version: ['1.23']
steps: steps:
- name: Checkout code - name: Checkout code

2
v3/go.mod
View File

@ -5,7 +5,7 @@ go 1.24.0
require ( require (
github.com/Masterminds/semver v1.5.0 github.com/Masterminds/semver v1.5.0
github.com/adrg/xdg v0.5.3 github.com/adrg/xdg v0.5.3
github.com/atterpac/refresh v0.8.4 github.com/atterpac/refresh v0.8.6
github.com/bep/debounce v1.2.1 github.com/bep/debounce v1.2.1
github.com/charmbracelet/glamour v0.8.0 github.com/charmbracelet/glamour v0.8.0
github.com/ebitengine/purego v0.8.2 github.com/ebitengine/purego v0.8.2

2
v3/go.sum
View File

@ -59,6 +59,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk= github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
github.com/atterpac/refresh v0.8.4 h1:jRgX8TwZaMTqDmcFemhtnpJsrlmEmwwSILUQczHTxY8= github.com/atterpac/refresh v0.8.4 h1:jRgX8TwZaMTqDmcFemhtnpJsrlmEmwwSILUQczHTxY8=
github.com/atterpac/refresh v0.8.4/go.mod h1:fJpWySLdpbANS8Ej5OvfZVZIVvi/9bmnhTjKS5EjQes= github.com/atterpac/refresh v0.8.4/go.mod h1:fJpWySLdpbANS8Ej5OvfZVZIVvi/9bmnhTjKS5EjQes=
github.com/atterpac/refresh v0.8.6 h1:Q5miKV2qs9jW+USw8WZ/54Zz8/RSh/bOz5U6JvvDZmM=
github.com/atterpac/refresh v0.8.6/go.mod h1:fJpWySLdpbANS8Ej5OvfZVZIVvi/9bmnhTjKS5EjQes=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8= github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=