diff --git a/.github/scripts/deploy-review-app.sh b/.github/scripts/deploy-review-app.sh index bcd6cf9929c162099e8fd9a29e57602c580e8e22..4b356c928a49a63d7af9353b491a5847a700e389 100755 --- a/.github/scripts/deploy-review-app.sh +++ b/.github/scripts/deploy-review-app.sh @@ -10,12 +10,11 @@ org="shields-io" # 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") -# Attempt to apply the PR diff to the target branch -# This will fail if it does not merge cleanly +# Checkout the PR branch git config user.name "actions[bot]" git config user.email "actions@users.noreply.github.com" 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 ! flyctl status --app "$app"; then