From 22ad04743cad4861e3a7e7196bb9e70c3793e696 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 30 Nov 2021 22:14:34 +0200 Subject: [PATCH 1/2] GHA: Add workflow_dispatch to enable manually triggering builds --- .github/workflows/cifuzz.yml | 2 ++ .github/workflows/lint.yml | 2 +- .github/workflows/release-drafter.yml | 1 + .github/workflows/test-docker.yml | 2 +- .github/workflows/test-mingw.yml | 2 +- .github/workflows/test-valgrind.yml | 1 + .github/workflows/test-windows.yml | 2 +- .github/workflows/test.yml | 2 +- 8 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 9fe8f774ff4..7e2fbf28f88 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -1,4 +1,5 @@ name: CIFuzz + on: push: paths: @@ -8,6 +9,7 @@ on: paths: - "**.c" - "**.h" + workflow_dispatch: jobs: Fuzzing: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8234d57dc5a..533ce8cbd53 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,6 +1,6 @@ name: Lint -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 58bb2cddf11..ad66117b187 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -5,6 +5,7 @@ on: # branches to consider in the event; optional, defaults to all branches: - main + workflow_dispatch: jobs: update_release_draft: diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 3a2b501b1f6..57396fddcce 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -1,6 +1,6 @@ name: Test Docker -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index bd2de238139..051cfc48347 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -1,6 +1,6 @@ name: Test MinGW -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml index 03c8022f3e4..4a8966ca8b3 100644 --- a/.github/workflows/test-valgrind.yml +++ b/.github/workflows/test-valgrind.yml @@ -11,6 +11,7 @@ on: paths: - "**.c" - "**.h" + workflow_dispatch: jobs: build: diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 027d39fd175..3a0a1641693 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -1,6 +1,6 @@ name: Test Windows -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d18052f82d..9bbc426e29c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Test -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] jobs: build: From 915d014136d769f07654109fab383796ddccf4ed Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 1 Dec 2021 12:42:11 +0200 Subject: [PATCH 2/2] GHA: Change condition to allow manually building wheels in forks --- .github/workflows/test-windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 3a0a1641693..c768838eb06 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -132,7 +132,7 @@ jobs: - name: Build Pillow run: | $FLAGS="" - if ('${{ github.event_name }}' -eq 'push') { $FLAGS="--disable-imagequant" } + if ('${{ github.event_name }}' -ne 'pull_request') { $FLAGS="--disable-imagequant" } & winbuild\build\build_pillow.cmd $FLAGS install & $env:pythonLocation\python.exe selftest.py --installed shell: pwsh @@ -175,14 +175,14 @@ jobs: - name: Build wheel id: wheel - if: "github.event_name == 'push'" + if: "github.event_name != 'pull_request'" run: | for /f "tokens=3 delims=/" %%a in ("${{ github.ref }}") do echo ::set-output name=dist::dist-%%a winbuild\\build\\build_pillow.cmd --disable-imagequant bdist_wheel shell: cmd - uses: actions/upload-artifact@v2 - if: "github.event_name == 'push'" + if: "github.event_name != 'pull_request'" with: name: ${{ steps.wheel.outputs.dist }} path: dist\*.whl