From f475b84219cbb9049acb48c3f0aac4a020040c49 Mon Sep 17 00:00:00 2001 From: rad-ci-bot <103787451+rad-ci-bot@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:29:26 -0800 Subject: [PATCH] Upmerge to edge (#1307) * Update docs for v0.40.0 * upmerge commit signoff (#1299) Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com> * emtpy test commit Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com> --------- Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com> Signed-off-by: Radius CI Bot Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com> --- .github/workflows/upmerge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index 890455219..9c7ecd733 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -68,7 +68,7 @@ jobs: git fetch 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" + git commit --signoff --message "Upmerge to edge" if git diff --quiet edge; then echo "No changes to merge from $SOURCE_BRANCH to edge"