Skip to content

Commit ef33bf8

Browse files
committed
Merge branch 'build/wp-6.9-setup-npm' into build/wp-6.9-node-24
2 parents b536335 + 1f34151 commit ef33bf8

2 files changed

Lines changed: 2 additions & 39 deletions

File tree

‎.github/workflows/end2end-test.yml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ jobs:
8282
needs: [e2e-playwright]
8383
runs-on: 'ubuntu-24.04'
8484
permissions: {}
85-
outputs:
86-
has-flaky-test-report: ${{ !!steps.merge-flaky-tests-reports.outputs.artifact-id }}
8785
steps:
8886
- name: Merge failures artifacts
8987
uses: actions/upload-artifact/merge@v4
@@ -104,39 +102,3 @@ jobs:
104102
pattern: flaky-tests-report*
105103
delete-merged: true
106104

107-
report-to-issues:
108-
name: Report to GitHub
109-
needs: [merge-artifacts]
110-
if: ${{ needs.merge-artifacts.outputs.has-flaky-test-report == 'true' }}
111-
runs-on: 'ubuntu-24.04'
112-
permissions:
113-
contents: read
114-
issues: write
115-
pull-requests: write
116-
steps:
117-
# Use this branch's own report-flaky-tests: trunk's version takes
118-
# different inputs and fails this workflow.
119-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
120-
with:
121-
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
122-
persist-credentials: false
123-
124-
- uses: actions/download-artifact@v5.0.0
125-
# Don't fail the job if there isn't any flaky tests report.
126-
continue-on-error: true
127-
with:
128-
name: flaky-tests-report
129-
path: flaky-tests
130-
131-
- name: Setup Node.js and install dependencies
132-
uses: ./.github/setup-node
133-
134-
- name: Npm build
135-
run: npm run build
136-
137-
- name: Report flaky tests
138-
uses: ./packages/report-flaky-tests
139-
with:
140-
repo-token: '${{ secrets.GITHUB_TOKEN }}'
141-
label: '[Type] Flaky Test'
142-
artifact-path: flaky-tests

‎.github/workflows/unit-test.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ jobs:
124124
-H "Accept: application/json" \
125125
-o versions.json \
126126
"http://api.wordpress.org/core/stable-check/1.0/"
127-
LATEST_WP_VERSION="$(jq --raw-output 'with_entries(select(.value=="latest"))|keys[]' versions.json)"
127+
# Count back from this branch's release, not the newest WordPress release.
128+
LATEST_WP_VERSION='6.9'
128129
# shellcheck disable=SC2034
129130
IFS='.' read -r LATEST_WP_MAJOR LATEST_WP_MINOR LATEST_WP_PATCH <<< "${LATEST_WP_VERSION}"
130131
if [[ "${LATEST_WP_MINOR}" == "0" ]]; then

0 commit comments

Comments
 (0)