diff --git a/.github/workflows/generate-sponsor-image.yml b/.github/workflows/generate-sponsor-image.yml index b8bb0c4ac..585d7e19f 100644 --- a/.github/workflows/generate-sponsor-image.yml +++ b/.github/workflows/generate-sponsor-image.yml @@ -29,7 +29,12 @@ jobs: with: commit-message: "chore: update sponsors.svg" add-paths: "website/static/img/sponsors.svg" - title: Update Sponsor Image - body: Generated new image + title: "chore: update sponsors.svg" + body: | + Auto-generated by the sponsor image workflow + + [skip ci] [skip actions] branch: update-sponsors + base: master delete-branch: true + draft: false diff --git a/.github/workflows/pr-v3.yml b/.github/workflows/pr-master.yml similarity index 71% rename from .github/workflows/pr-v3.yml rename to .github/workflows/pr-master.yml index 7349008ad..6f0043b56 100644 --- a/.github/workflows/pr-v3.yml +++ b/.github/workflows/pr-master.yml @@ -1,4 +1,4 @@ -name: PR Checks +name: PR Checks (master) on: pull_request: @@ -29,33 +29,14 @@ 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 - test_go: name: Run Go Tests runs-on: ${{ matrix.os }} - if: github.event.review.state == 'approved' && github.repository == 'wailsapp/wails' && github.base_ref == 'master' + if: > + github.event.review.state == 'approved' && + github.repository == 'wailsapp/wails' && + github.base_ref == 'master' && + github.head_ref != 'update-sponsors' strategy: matrix: os: [ubuntu-22.04, windows-latest, macos-latest, ubuntu-24.04] @@ -65,11 +46,11 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Install linux dependencies ( 22.04 ) + - name: Install linux dependencies (22.04) if: matrix.os == 'ubuntu-22.04' run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config - - name: Install linux dependencies ( 24.04 ) + - name: Install linux dependencies (24.04) if: matrix.os == 'ubuntu-24.04' run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev build-essential pkg-config