Skip to content

Commit 505b6a4

Browse files
author
Release Manager
committed
gh-36632: .ci/merge-fixes.sh: Reduce output <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> We suppress long output (https://github.com/sagemath/sage/actions/runs/6 738804468/job/18319117745?pr=36508#step:3:11) and scary-looking but harmless error messages (https://github.com/sagemath/sage/actions/runs/6 738804468/job/18319117745?pr=36508#step:3:1114). Example of a quieter run with this change: https://github.com/sagemath/s age/actions/runs/6739070170/job/18319882833?pr=36632#step:3:19 <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36632 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
2 parents 29e95c5 + 3eb8408 commit 505b6a4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.ci/merge-fixes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ else
1414
git tag -f test_base
1515
git commit -q -m "Uncommitted changes" --no-allow-empty -a
1616
for a in $PRs; do
17+
git fetch --unshallow --all > /dev/null 2>&1 && echo "Unshallowed."
1718
echo "::group::Merging PR https://github.com/$REPO/pull/$a"
1819
git tag -f test_head
1920
$GH pr checkout -b pr-$a $a
20-
git fetch --unshallow --all
2121
git checkout -q test_head
2222
if git merge --no-edit --squash -q pr-$a; then
2323
echo "::endgroup::"

0 commit comments

Comments
 (0)