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

chore(examples): rename flask-ride-sharing-app in tutorial #3778

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

kolesnikovae
Copy link
Collaborator

@kolesnikovae kolesnikovae commented Dec 13, 2024

In #3769 I renamed the flask-ride-sharing-app to ride-sharing-app to align with the shared README, where it is referred to in this way. However, in the KillerCoda tutorial, we're still using flask-ride-sharing-app. I'm updating the tutorial to reflect the new name and add a link to README.

@kolesnikovae kolesnikovae requested review from a team as code owners December 13, 2024 12:02
@kolesnikovae kolesnikovae changed the title chore(examples): rename flask-ride-share-app in tutorial and add link from the example chore(examples): rename flask-ride-share-app in tutorial Dec 13, 2024
@kolesnikovae kolesnikovae changed the title chore(examples): rename flask-ride-share-app in tutorial chore(examples): rename flask-ride-sharing-app in tutorial Dec 13, 2024
Copy link
Contributor

@simonswine simonswine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Was not really aware of killercoda.com. I imagine we need to backport those PRs, in order to update the "latest" version of the docs.

@simonswine simonswine added backport release/v1.9 This label will backport a merged PR to the release/v1.9 branch backport release/v1.10 This label will backport a merged PR to the release/v1.10 branch type/docs Improvements for doc docs. Used by Docs team for project management labels Dec 13, 2024
Copy link
Contributor

Hello @simonswine!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

1 similar comment
Copy link
Contributor

Hello @simonswine!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

Copy link
Contributor

This PR must be merged before a backport PR will be created.

@simonswine simonswine merged commit 7ec96ae into main Dec 16, 2024
21 checks passed
@simonswine simonswine deleted the fix(example)/sdk-examples branch December 16, 2024 09:59
Copy link
Contributor

The backport to release/v1.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3778-to-release/v1.9 origin/release/v1.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 7ec96ae36b26e9cc404881c62986128557be71d6

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3778-to-release/v1.9
# Create the PR body template
PR_BODY=$(gh pr view 3778 --json body --template 'Backport 7ec96ae36b26e9cc404881c62986128557be71d6 from #3778{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.9] chore(examples): rename flask-ride-sharing-app in tutorial' --body-file - --label 'type/docs' --label 'backport' --base release/v1.9 --milestone release/v1.9 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3778-to-release/v1.9

# Create a pull request where the `base` branch is `release/v1.9` and the `compare`/`head` branch is `backport-3778-to-release/v1.9`.

# Remove the local backport branch
git switch main
git branch -D backport-3778-to-release/v1.9

Copy link
Contributor

The backport to release/v1.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3778-to-release/v1.10 origin/release/v1.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 7ec96ae36b26e9cc404881c62986128557be71d6

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3778-to-release/v1.10
# Create the PR body template
PR_BODY=$(gh pr view 3778 --json body --template 'Backport 7ec96ae36b26e9cc404881c62986128557be71d6 from #3778{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.10] chore(examples): rename flask-ride-sharing-app in tutorial' --body-file - --label 'type/docs' --label 'backport' --base release/v1.10 --milestone release/v1.10 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3778-to-release/v1.10

# Create a pull request where the `base` branch is `release/v1.10` and the `compare`/`head` branch is `backport-3778-to-release/v1.10`.

# Remove the local backport branch
git switch main
git branch -D backport-3778-to-release/v1.10

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.9 This label will backport a merged PR to the release/v1.9 branch backport release/v1.10 This label will backport a merged PR to the release/v1.10 branch backport-failed type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants