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

Jump to bottom

Update upmerge workflow to ignore config and body-end changes #1267

Merged
merged 2 commits into from
Nov 7, 2024
Merged

Update upmerge workflow to ignore config and body-end changes #1267

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
422ce84
update upmerge
sk593 Nov 7, 2024
303574b
readd signoff
sk593 Nov 7, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/upmerge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ jobs:
export SOURCE_BRANCH=$(basename ${{ github.ref }})
echo "Upmerging docs from $SOURCE_BRANCH to edge"
git fetch origin $SOURCE_BRANCH

git merge -m "Upmerge to edge" origin/$SOURCE_BRANCH
git merge --no-commit origin/$SOURCE_BRANCH
git checkout edge -- docs/config.toml docs/layouts/partials/hooks/body-end.html
git commit -m "Upmerge to edge"

if git diff --quiet edge; then
echo "No changes to merge from $SOURCE_BRANCH to edge"
echo "NO_CHANGES=true" >> $GITHUB_ENV
else
echo "Pushing $BRANCH_NAME for PR to edge"
git reset HEAD docs/config.toml docs/layouts/partials/hooks/body-end.html
git push --set-upstream origin $BRANCH_NAME
fi

Expand Down
Loading