Skip to content
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

gh-109408: Run patchcheck in GitHub Actions #109459

Closed
wants to merge 13 commits into from
Closed

gh-109408: Run patchcheck in GitHub Actions #109459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fd695d5
gh-109408: Run `patchcheck` in GitHub Actions
sobolevn Sep 15, 2023
7bc1997
try to fix ci
sobolevn Sep 15, 2023
86622a8
try to fix ci
sobolevn Sep 15, 2023
47da9c3
try to fix ci
sobolevn Sep 15, 2023
073d8ee
try to fix ci
sobolevn Sep 15, 2023
3c0630f
try to fix ci
sobolevn Sep 15, 2023
dbdc48a
try to fix ci
sobolevn Sep 15, 2023
c6e2717
try to fix ci
sobolevn Sep 15, 2023
375cff9
debug
sobolevn Sep 15, 2023
89ff09e
Run patchcheck as a part of "Check generated files" job
sobolevn Sep 15, 2023
703be97
Use `make`
sobolevn Sep 15, 2023
0f33871
Try without `git fetch origin`
sobolevn Sep 16, 2023
e630416
Return `git fetch origin` back
sobolevn Sep 16, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ jobs:
make regen-deepfreeze
make -j4 regen-all
make regen-stdlib-module-names
- name: Run patchcheck
if: github.event_name == 'pull_request'
run: |
git fetch origin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to fetch origin? It takes 1m 49s for this step.

We don't do it on Azure Pipelines and patchcheck takes 2s.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try :)

I think that we might need it because of the heavy git machinery inside patchcheck.
I think we might need it during backports for older branches.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, it does not work:

Run # git fetch origin
Checked 107 modules (31 built-in, 75 shared, 1 n/a on linux-x86_64, 0 disabled, 0 missing, 0 failed on import)
LD_LIBRARY_PATH=/home/runner/work/cpython/cpython ./python ./Tools/patchcheck/patchcheck.py --ci true
Getting base branch for PR ... origin/main
fatal: ambiguous argument 'origin/main': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
error running git diff --name-status origin/main
make: *** [Makefile:2914: patchcheck] Error 1
Getting the list of files that have been added/changed ...

make ARGS="--ci true" patchcheck
- name: Check for changes
run: |
git add -u
Expand Down
2 changes: 1 addition & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2764,7 +2764,7 @@ funny:
# Perform some verification checks on any modified files.
.PHONY: patchcheck
patchcheck: all
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/patchcheck/patchcheck.py
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/patchcheck/patchcheck.py $(ARGS)

.PHONY: check-limited-abi
check-limited-abi: all
Expand Down