Skip to content

ci: improve things around auto-apply of fixes #36349

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 12 commits into from
Closed

ci: improve things around auto-apply of fixes #36349

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97bfb3a
Only apply fixes for PRs
tobiasdiez Sep 28, 2023
75324e2
Install git as well
tobiasdiez Sep 28, 2023
0e7c0a4
reorder commands
tobiasdiez Sep 28, 2023
43194f8
First setup git repo, then apply fixes
tobiasdiez Sep 28, 2023
01678e1
Merge branch 'develop' into fix_get_ci_fixes-1
tobiasdiez Oct 10, 2023
7b12774
run also on forks, and change docbuild, conda and linter accordingly
tobiasdiez Oct 13, 2023
b5ee735
add safe directory git config
tobiasdiez Oct 13, 2023
e61d557
manually install git
tobiasdiez Oct 13, 2023
c729118
add --allow-unrelated-histories
tobiasdiez Oct 13, 2023
66cf6e1
Merge branch 'develop' into fix_get_ci_fixes-1
tobiasdiez Oct 15, 2023
da5d53d
Merge branch 'develop' into fix_get_ci_fixes-1
tobiasdiez Oct 21, 2023
20fb5c3
Merge branch 'develop' into fix_get_ci_fixes-1
tobiasdiez Nov 15, 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
Prev Previous commit
Next Next commit
add --allow-unrelated-histories
  • Loading branch information
@tobiasdiez
tobiasdiez authored Oct 13, 2023
commit c729118fc6a7227146174077692852f2d20ac99c
2 changes: 1 addition & 1 deletion .ci/merge-fixes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ else
$GH pr checkout -b pr-$a $a
git fetch --unshallow --all
git checkout -q test_head
if git merge --no-edit --squash -q pr-$a; then
if git merge --no-edit --squash --allow-unrelated-histories -q pr-$a; then
Copy link
Contributor

@mkoeppe mkoeppe Oct 21, 2023

Choose a reason for hiding this comment

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

if one has to use this flag, typically something's wrong already

Copy link
Contributor Author

@tobiasdiez tobiasdiez Oct 22, 2023

Choose a reason for hiding this comment

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

The checkout action results in a detached head for PRs. You can call that "wrong" but its by design.

echo "::endgroup::"
if git commit -q -m "Merge https://github.com/$REPO/pull/$a" -a --no-allow-empty; then
echo "Merged #$a"
Expand Down