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

Update GitHub Actions workflows. #192

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Update GitHub Actions workflows. #192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions scripts/upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@ end_rebase() {
rebase_merge_dir=$(cd upstream && git rev-parse --git-path rebase-merge)
rebase_apply_dir=$(cd upstream && git rev-parse --git-path rebase-apply)

if [[ -d "${rebase_merge_dir}" || -d "${rebase_apply_dir}" ]]; then
if [ -d "${rebase_merge_dir}" ] || [ -d "${rebase_apply_dir}" ]; then
echo "rebase still in progress in './upstream'. Please resolve the rebase in"
echo "'./upstream' and then run 'make \"$1\"' again."
exit 1
fi

rm patches/*.patch
cd upstream
git format-patch local -o ../patches --no-prefix --zero-commit --no-signature --no-stat
git format-patch local -o ../patches --zero-commit --no-signature --no-stat
cd ..
rm rebase-in-progress
apply "$1"
Expand Down
Loading