mirror of
git://develop.git.wordpress.org/
synced 2025-04-13 00:22:52 +02:00
Build/Test: Change default GitHub branch to trunk
See: https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/ See: https://make.wordpress.org/core/2020/06/18/proposal-update-all-git-repositories-to-use-main-instead-of-master/ Fixes #54399 git-svn-id: https://develop.svn.wordpress.org/trunk@52130 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
40799ba11f
commit
4160c23106
4
.github/workflows/coding-standards.yml
vendored
4
.github/workflows/coding-standards.yml
vendored
@ -5,7 +5,6 @@ on:
|
||||
# PHPCS checking was introduced in WordPress 5.1.
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[89]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -14,7 +13,6 @@ on:
|
||||
- '[4-9].[0-9]*'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[89]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -149,7 +147,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ phpcs, jshint ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
4
.github/workflows/end-to-end-tests.yml
vendored
4
.github/workflows/end-to-end-tests.yml
vendored
@ -4,7 +4,6 @@ on:
|
||||
# The end to end test suite was introduced in WordPress 5.3.
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '5.[3-9]'
|
||||
- '[6-9].[0-9]'
|
||||
@ -13,7 +12,6 @@ on:
|
||||
- '[6-9].[0-9]*'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '5.[3-9]'
|
||||
- '[6-9].[0-9]'
|
||||
@ -119,7 +117,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ e2e-tests ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
4
.github/workflows/javascript-tests.yml
vendored
4
.github/workflows/javascript-tests.yml
vendored
@ -4,7 +4,6 @@ on:
|
||||
# JavaScript testing was introduced in WordPress 3.8.
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[89]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -13,7 +12,6 @@ on:
|
||||
- '[4-9].[0-9]*'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[89]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -88,7 +86,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ test-js ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
4
.github/workflows/php-compatibility.yml
vendored
4
.github/workflows/php-compatibility.yml
vendored
@ -4,7 +4,6 @@ on:
|
||||
# PHP compatibility testing was introduced in WordPress 5.5.
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '5.[5-9]'
|
||||
- '[6-9].[0-9]'
|
||||
@ -13,7 +12,6 @@ on:
|
||||
- '[6-9].[0-9]*'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '5.[5-9]'
|
||||
- '[6-9].[0-9]'
|
||||
@ -90,7 +88,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ php-compatibility ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
8
.github/workflows/phpunit-tests.yml
vendored
8
.github/workflows/phpunit-tests.yml
vendored
@ -3,7 +3,6 @@ name: PHPUnit Tests
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[7-9]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -12,7 +11,6 @@ on:
|
||||
- '[4-9].[0-9]*'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[7-9]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -231,21 +229,21 @@ jobs:
|
||||
run: git diff --exit-code
|
||||
|
||||
- name: Checkout the WordPress Test Reporter
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
|
||||
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
|
||||
with:
|
||||
repository: 'WordPress/phpunit-test-runner'
|
||||
path: 'test-runner'
|
||||
|
||||
- name: Submit test results to the WordPress.org host test results
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/master' && matrix.report }}
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
|
||||
env:
|
||||
WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
|
||||
run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ test-php ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
3
.github/workflows/test-coverage.yml
vendored
3
.github/workflows/test-coverage.yml
vendored
@ -4,7 +4,6 @@ on:
|
||||
# Verify
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
paths:
|
||||
- '.github/workflows/test-coverage.yml'
|
||||
@ -171,7 +170,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ test-coverage-report ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
4
.github/workflows/test-npm.yml
vendored
4
.github/workflows/test-npm.yml
vendored
@ -3,13 +3,11 @@ name: Test NPM
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[7-9]'
|
||||
- '[4-9].[0-9]'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
- '3.[7-9]'
|
||||
- '[4-9].[0-9]'
|
||||
@ -157,7 +155,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ test-npm, test-npm-macos ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
3
.github/workflows/test-old-branches.yml
vendored
3
.github/workflows/test-old-branches.yml
vendored
@ -4,7 +4,6 @@ on:
|
||||
# Verify the workflow is successful when this file is updated.
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- trunk
|
||||
paths:
|
||||
- '.github/workflows/test-old-branches.yml'
|
||||
@ -72,7 +71,7 @@ jobs:
|
||||
|
||||
slack-notifications:
|
||||
name: Slack Notifications
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@master
|
||||
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
|
||||
needs: [ dispatch-workflows-for-old-branches ]
|
||||
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
|
||||
with:
|
||||
|
Loading…
x
Reference in New Issue
Block a user