Skip to content
Snippets Groups Projects
Unverified Commit c47f9321 authored by LitoMore's avatar LitoMore Committed by GitHub
Browse files

Adjust `deploy-review-app` script (#9317)

parent 53efe528
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.github/scripts/deploy-review-app.sh
+ 2
− 3
View file @ c47f9321
...@@ -10,12 +10,11 @@ org="shields-io" ...@@ -10,12 +10,11 @@ org="shields-io"
# This will fail if $PR_NUMBER is not a valid PR # This will fail if $PR_NUMBER is not a valid PR
pr_json=$(curl --fail "https://api.github.com/repos/badges/shields/pulls/$PR_NUMBER") pr_json=$(curl --fail "https://api.github.com/repos/badges/shields/pulls/$PR_NUMBER")
# Attempt to apply the PR diff to the target branch # Checkout the PR branch
# This will fail if it does not merge cleanly
git config user.name "actions[bot]" git config user.name "actions[bot]"
git config user.email "actions@users.noreply.github.com" git config user.email "actions@users.noreply.github.com"
git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER" git fetch origin "pull/$PR_NUMBER/head:pr-$PR_NUMBER"
git merge "pr-$PR_NUMBER" git checkout "pr-$PR_NUMBER"
# If the app does not already exist, create it # If the app does not already exist, create it
if ! flyctl status --app "$app"; then if ! flyctl status --app "$app"; then
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment