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.

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

Fix upmerge workflow error when no changes #1192

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

brooke-hamilton
Copy link
Contributor

Thank you for helping make the Radius documentation better!

Please follow this checklist before submitting:

  • Read the contribution guide
  • Commands include options for Linux, MacOS, and Windows within codetabs
  • New file and folder names are globally unique
  • Page references use shortcodes instead of markdown or URL links
  • Images use HTML style and have alternative text
  • Places where multiple code/command options are given have codetabs

In addition, please fill out the following to help reviewers understand this pull request:

Description

Fixes an issue in which the upmerge docs to edge action workflow completes with an error when there are no changes to merge to the edge branch.

This PR is similar to a PR #1649 in the samples repo. We do not have a common set of automation yet, so workflows like this must be replicated and updated in each repo.

Issue reference

Fixes: #1163

Changes

  • The upmerge.yaml file has been updated to check for changes before attempting to create a new PR.
  • Comments added to explain context and actions taken in the workflow.
  • Merge and commit in one git command instead of two. Not all merges create a merge commit, so this allows for specifying a merge comment that will only be used if a commit is created by the merge.
  • Other minor code improvements.

Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
@Reshrahim Reshrahim merged commit 3f751f6 into radius-project:v0.36 Aug 14, 2024
9 checks passed
Reshrahim added a commit that referenced this pull request Aug 16, 2024
* Update docs for v0.36.0

* Update auto-generated documentation (#1151)

* Autogenerate reference docs

Signed-off-by: rad-ci-bot <rad-ci-bot@users.noreply.github.com>

* Update en-custom.txt 

Signed-off-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>

---------

Signed-off-by: rad-ci-bot <rad-ci-bot@users.noreply.github.com>
Signed-off-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>
Co-authored-by: rad-ci-bot <rad-ci-bot@users.noreply.github.com>
Co-authored-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>

* Add HowTo tutorial to configure Terraform Custom Provider (#1162)

* add howto doc for tf custom provider config

* unsaved files

* update per comments

* update for conflicts

* extra space

* extra space

* further comments

* capitalizing Environment

* one more change

---------

Signed-off-by: Lakshmi Javadekar <103459615+lakshmimsft@users.noreply.github.com>

* correct highlight (#1164)

* Update index.md (#1160)

Signed-off-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>

* Add envSecrets block to HowTo Custom Provider tutorial (#1166)

* adding envSecrets

* updated per suggestion

* removing port input in config (#1167)

* Fix upmerge workflow error when no changes (#1192)

Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>

* addressing comments

Signed-off-by: Vishwanath Hiremath <vhiremath@microsoft.com>

* addressing comments

Signed-off-by: Vishwanath Hiremath <vhiremath@microsoft.com>

---------

Signed-off-by: rad-ci-bot <rad-ci-bot@users.noreply.github.com>
Signed-off-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>
Signed-off-by: Lakshmi Javadekar <103459615+lakshmimsft@users.noreply.github.com>
Signed-off-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Signed-off-by: Vishwanath Hiremath <vhiremath@microsoft.com>
Co-authored-by: Radius CI Bot <radiuscoreteam@service.microsoft.com>
Co-authored-by: rad-ci-bot <103787451+rad-ci-bot@users.noreply.github.com>
Co-authored-by: rad-ci-bot <rad-ci-bot@users.noreply.github.com>
Co-authored-by: Reshma Abdul Rahim <61033581+Reshrahim@users.noreply.github.com>
Co-authored-by: Lakshmi Javadekar <103459615+lakshmimsft@users.noreply.github.com>
Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix upmerge docs to edge workflow
3 participants