Add optional --force-with-lease to pr push action.

paketo-buildpacks · Jun 5, 2024 · 89d04c2 · 89d04c2
1 parent b929f04
commit 89d04c2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/actions/pull-request/push-branch/action.yml b/actions/pull-request/push-branch/action.yml
@@ -7,10 +7,16 @@ inputs:
   branch:
     description: 'Name of the branch to push'
     required: true
+  force:
+    description: 'Push using --force-with-lease'
+    required: false
+    default: ""
 
 runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
   - "--branch"
   - ${{ inputs.branch }}
+  - "--force"
+  - ${{ inputs.force }}
diff --git a/actions/pull-request/push-branch/entrypoint b/actions/pull-request/push-branch/entrypoint
@@ -3,14 +3,19 @@ set -euo pipefail
 shopt -s inherit_errexit
 
 function main() {
-  local branch
+  local branch force
   while [ "${#}" != 0 ]; do
     case "${1}" in
       --branch)
         branch="${2}"
         shift 2
         ;;
 
+      --force)
+        force="${2}"
+        shift 2
+        ;;
+
       "")
         shift
         ;;
@@ -22,7 +27,12 @@ function main() {
   done
 
   git config --global --add safe.directory "${GITHUB_WORKSPACE}"
-  git push origin "${branch}"
+
+  if [[ "${force}" == "true" ]]; then
+    git push origin "${branch}" --force-with-lease
+  else
+    git push origin "${branch}"
+  fi
 }
 
 main "${@:-}"