Skip to content

Merge to master before running tests #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed

Merge to master before running tests #217

Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a837256
Merge to master before running tests
Jan 30, 2025
8de08ff
Fetch master before merging
Jan 30, 2025
bb3aa3d
Full name when local merging
Jan 30, 2025
06fe0d5
Pull instead of fetch
Jan 30, 2025
0c3aed2
Trying pulling all history on checkout
Jan 30, 2025
20a517a
Suggested in error
Jan 30, 2025
7458d5c
Reorder and more simetric names
Jan 30, 2025
a614be8
Typo and cosmetics
Jan 31, 2025
bf61fe2
Fix 'Committer identity unknown' and show merge diff
Feb 3, 2025
c7eaae0
Merge to local master
Feb 3, 2025
833ad1d
Fetch master history
Feb 3, 2025
c6d4ce0
Maybe origin is missing
Feb 3, 2025
d1c7893
Space
Feb 3, 2025
938e387
Full refname on merge, and debug info
Feb 3, 2025
b59b306
Typo and more debug
Feb 3, 2025
b1436de
Testing if is possible to checkout master via refs, and return back t…
Feb 3, 2025
90677d9
Returnt to detached HEAD state of master checkout
Feb 3, 2025
8a25606
Change step to a error
Feb 3, 2025
c496e97
Change step to a error
Feb 3, 2025
b7b547b
Bump
Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/integrate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,28 @@ jobs:
- "zh"

steps:
- name: "Checkout"
- name: "Checkout doc-base"
uses: "actions/checkout@v4"
with:
path: "doc-base"
fetch-depth: 0

- name: "Checkout php/doc-${{ matrix.language }}"
- name: "Checkout doc-${{ matrix.language }}"
uses: "actions/checkout@v4"
with:
path: "${{ matrix.language }}"
repository: "php/doc-${{ matrix.language }}"

- name: "Checkout php/doc-en as fallback"
- name: "Checkout doc-en (fallback)"
if: "matrix.language != 'en'"
uses: "actions/checkout@v4"
with:
path: "en"
repository: "php/doc-en"

- name: "Pull merged doc-base changes from master"
run: "git -C doc-base merge --no-ff --no-commit origin/master"

- name: "Run QA scripts for EN docs"
if: "matrix.language == 'en'"
run: |
Expand Down
Loading