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