From 7c4d9f82625016839488a2dcc1f115b60fe185c1 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 08:55:14 +1100 Subject: [PATCH 1/9] Allow Empty From 05aa2853d79e31a9b127412f1569adada0921e70 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:03:37 +1100 Subject: [PATCH 2/9] Allow Empty From 79c5d54f7b46cb9d27178bf1a47cee84a73375f9 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:16:34 +1100 Subject: [PATCH 3/9] feature branch --- .github/workflows/phpunit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 8c5e3257222bf..73462a8fd1c11 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -6,6 +6,7 @@ on: - trunk - '3.[7-9]' - '[4-9].[0-9]' + - feature/** tags: - '[0-9]+.[0-9]' - '[0-9]+.[0-9].[0-9]+' @@ -14,6 +15,7 @@ on: - trunk - '3.[7-9]' - '[4-9].[0-9]' + - feature/** workflow_dispatch: # Once weekly On Sundays at 00:00 UTC. schedule: @@ -40,7 +42,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( ! startsWith( 'feature/', github.base_ref ) || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: From 269507f5c2bac17a98b6e8e2a194ec3ee19a759b Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:21:09 +1100 Subject: [PATCH 4/9] refs/head/feature branch --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 73462a8fd1c11..2b7755ef66696 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -42,7 +42,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( ! startsWith( 'feature/', github.base_ref ) || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( ! startsWith( 'refs/heads/feature/', github.base_ref ) || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: From b206979d666e6fe56d6c0be1b60145326af442a8 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:23:22 +1100 Subject: [PATCH 5/9] starts with --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 2b7755ef66696..9ad6ea966e3cf 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -42,7 +42,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( ! startsWith( 'refs/heads/feature/', github.base_ref ) || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( ! startsWith( github.base_ref, 'refs/heads/feature/' ) || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: From 4241eb86fcef8f950ee68dbe7786344a81d6ce3e Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:25:48 +1100 Subject: [PATCH 6/9] starts with != true --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 9ad6ea966e3cf..b846bc7a1212d 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -42,7 +42,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( ! startsWith( github.base_ref, 'refs/heads/feature/' ) || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( startsWith( github.base_ref, 'refs/heads/feature/' ) != true || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: From 5aeb6fb06ea4ed8b3dfa734f48b72863dc2d7c40 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:29:21 +1100 Subject: [PATCH 7/9] More --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index b846bc7a1212d..fc1d41dad705e 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -42,7 +42,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( startsWith( github.base_ref, 'refs/heads/feature/' ) != true || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( startsWith( github.base_ref, 'feature/' ) != true || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: From 5cc004b14f79232a28e5a992b9d4e24f8ee97ae2 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:31:12 +1100 Subject: [PATCH 8/9] More --- .github/workflows/phpunit-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index fc1d41dad705e..88e1281a1cba3 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -113,7 +113,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( startsWith( github.base_ref, 'feature/' ) != true || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: @@ -163,7 +163,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( startsWith( github.base_ref, 'feature/' ) != true || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: @@ -206,7 +206,7 @@ jobs: permissions: contents: read secrets: inherit - if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }} + if: ${{ ( github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' ) && ( startsWith( github.base_ref, 'feature/' ) != true || vars.ALLOW_FEATURE_BRANCHES == 'true' ) }} strategy: fail-fast: false matrix: From 139eb6a84710e436ea1026f05169203517617e68 Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Wed, 22 Jan 2025 09:33:51 +1100 Subject: [PATCH 9/9] Env variable added to settings.