diff --git a/.github/workflows/build-and-test-v3.yml b/.github/workflows/build-and-test-v3.yml index 54a0a280c..b0852259a 100644 --- a/.github/workflows/build-and-test-v3.yml +++ b/.github/workflows/build-and-test-v3.yml @@ -91,7 +91,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, ubuntu-latest, macos-latest] go-version: [1.24] steps: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr-v3.yml similarity index 71% rename from .github/workflows/pr.yml rename to .github/workflows/pr-v3.yml index 9e981bf1d..a6893f732 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr-v3.yml @@ -8,11 +8,10 @@ on: types: [submitted] branches: - master - 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 @@ -30,37 +29,37 @@ jobs: run: | echo "::warning::Feature branch does not contain any changes to the website." -# lint_go: -# name: Run Go Linters -# runs-on: ubuntu-latest -# steps: -# - name: Checkout code -# uses: actions/checkout@v4 -# -# - name: Setup Go -# uses: actions/setup-go@v4 -# with: -# go-version: "1.21" -# -# - name: Update go modules -# working-directory: ./v2 -# run: go mod tidy -# -# - name: Run Linter -# uses: golangci/golangci-lint-action@v3 -# with: -# version: v1.54 -# working-directory: ./v2 -# args: --timeout=10m0s --config ./.golangci.yml + # lint_go: + # name: Run Go Linters + # runs-on: ubuntu-latest + # steps: + # - name: Checkout code + # uses: actions/checkout@v4 + # + # - name: Setup Go + # uses: actions/setup-go@v4 + # with: + # go-version: "1.21" + # + # - name: Update go modules + # working-directory: ./v2 + # run: go mod tidy + # + # - name: Run Linter + # uses: golangci/golangci-lint-action@v3 + # with: + # version: v1.54 + # working-directory: ./v2 + # args: --timeout=10m0s --config ./.golangci.yml 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] - go-version: ['1.21'] + go-version: ['1.23'] steps: - name: Checkout code diff --git a/v3/go.mod b/v3/go.mod index 3067f25ff..c4ce9ceef 100644 --- a/v3/go.mod +++ b/v3/go.mod @@ -5,7 +5,7 @@ go 1.24.0 require ( github.com/Masterminds/semver v1.5.0 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/charmbracelet/glamour v0.8.0 github.com/ebitengine/purego v0.8.2 @@ -144,4 +144,4 @@ require ( modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.8.2 // indirect mvdan.cc/sh/v3 v3.10.0 // indirect -) +) \ No newline at end of file diff --git a/v3/go.sum b/v3/go.sum index 672302267..87f3fdbbc 100644 --- a/v3/go.sum +++ b/v3/go.sum @@ -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/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.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/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=