Skip to content

.ci/merge-fixes.sh: Obtain patches via URL, make customizable by repository variable #36686

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

Merged
merged 7 commits into from
Dec 10, 2023
Merged

.ci/merge-fixes.sh: Obtain patches via URL, make customizable by repository variable #36686

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
268b086
.ci/merge-fixes.sh: Obtain patches via URL
mkoeppe Nov 9, 2023
35cdbd0
.ci/merge-fixes.sh: Include commit URLs in console log and commit mes…
mkoeppe Nov 12, 2023
9dac729
.ci/merge-fixes.sh: Use https://github.com/$REPO/commits/$LAST_SHA
mkoeppe Nov 13, 2023
28c86cb
.ci/merge-fixes.sh: Handle variable SAGE_CI_FIXES_FROM_REPOS
mkoeppe Nov 13, 2023
01d9b73
.ci/merge-fixes.sh: Use repository variables, not secrets
mkoeppe Nov 13, 2023
e82c8ae
.github/workflows: Pass vars.SAGE_CI_FIXES_FROM_REPOSITORIES to .ci/m…
mkoeppe Nov 13, 2023
49b7f74
.ci/merge-fixes.sh: Fix up PULL_FILE
mkoeppe Nov 13, 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
.ci/merge-fixes.sh: Fix up PULL_FILE
  • Loading branch information
Matthias Koeppe committed Nov 13, 2023
commit 49b7f741187befa9c3b2636d32d3f1ea9a74eb6f
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 @@ -42,7 +42,7 @@ for REPO in ${SAGE_CI_FIXES_FROM_REPOSITORIES:-sagemath/sage}; do
# Considered alternative: Use https://github.com/$REPO/pull/$a.diff,
# which squashes everything into one diff without commit metadata.
PULL_URL="https://github.com/$REPO/pull/$a"
PULL_FILE=upstream/ci-fixes-${REPO%%/*}-${REPO##*/}
PULL_FILE="$REPO_FILE-$a"
PATH=build/bin:$PATH build/bin/sage-download-file --quiet "$PULL_URL.patch" $PULL_FILE.patch
date -u +"%Y-%m-%dT%H:%M:%SZ" > $PULL_FILE.date # Record the date, for future reference
LAST_SHA=$(sed -n -E '/^From [0-9a-f]{40}/s/^From ([0-9a-f]{40}).*/\1/p' $PULL_FILE.patch | tail -n 1)
Expand Down