Skip to content

Commit

Permalink
Upmerge to edge (#1307)
Browse files Browse the repository at this point in the history
* 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 <radiuscoreteam@service.microsoft.com>
Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
  • Loading branch information
rad-ci-bot and brooke-hamilton authored Dec 6, 2024
1 parent 85cab9d commit f475b84
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/upmerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f475b84

Please sign in to comment.