import

Author: dawidd6

.github/workflows/test.yml

@@ -1,14 +1,29 @@
 name: Test Action
 
-on: push
+on:
+ push:
+ branches:
+ - master
 
 jobs:
  test:
  runs-on: ubuntu-latest
  steps:
- - name: Checkout repo
+ - name: Checkout
  uses: actions/checkout@v2
- - name: Try push
+ with:
+ fetch-depth: 2
+ - name: Prepare
+ run: |
+ git checkout -b test-try-push
+ git push origin test-try-push
+ git reset --hard HEAD~1
+ git checkout -
+ - name: Push
  uses: ./
  with:
- tries: 5
+ branch: test-try-push
+ - name: Clean
+ if: always()
+ run: |
+ git push --delete origin test-try-push

README.md

@@ -1,17 +1,22 @@
-# Git try push Github Action
+# Git try push GitHub Action
 
-An action that tries to make a `git push`. If it does not succeed, then wait some time and try again. The number of maximum tries is controllable via `tries` input.
+An action that tries to make a `git push`. If it does not succeed, then wait some time, perform `git pull --rebase` and try again.
+The number of maximum tries is controllable via `tries` input.
 
 ## Usage
 
 ```yaml
 - name: Try pushing
- uses: dawidd6/action-git-try-push@master
+ uses: dawidd6/action-git-try-push@v1
  with:
  # Optional, used for pushing
  token: ${{github.token}}
  # Optional, defaults to current directory
  directory: path/to/repo
- # Optional, defaults to 10
+ # Optional, defaults to:
+ remote: origin
+ # Optional, defaults to:
+ branch: master
+ # Optional, defaults to:
  tries: 20
 ```

action.yml

@@ -6,14 +6,23 @@ branding:
  color: blue
 inputs:
  token:
- description: Github token (used for push, not required if not needed)
+ description: GitHub token (used for push)
  required: false
- tries:
- description: How many times to try pushing (defaults to 10)
- required: true
  directory:
- description: Repository directory (defaults to current)
+ description: Repository directory
+ required: false
+ remote:
+ description: Git remote
+ required: false
+ default: origin
+ branch:
+ description: Git branch
+ required: false
+ default: master
+ tries:
+ description: How many times to try pushing
  required: false
+ default: "20"
 runs:
  using: node12
  main: main.js

main.js

@@ -4,27 +4,42 @@ const exec = require('@actions/exec')
 async function main() {
  try {
  const token = core.getInput("token")
- const tries = core.getInput("tries") || 10
  const directory = core.getInput("directory")
+ const remote = core.getInput("remote", { required: true })
+ const branch = core.getInput("branch", { required: true })
+ const tries = core.getInput("tries", { required: true })
 
+ // Change directory.
  if (directory) {
  process.chdir(directory)
  }
 
+ // Set up token authentication for pushing.
+ // Command taken from actions/checkout.
  if (token) {
- await exec.exec("git", ["config", "--local", "http.https://github.com/.extraheader", `AUTHORIZATION: basic ${token}`])
+ await exec.exec("git", ["config", "--local", "http.https://github.com/.extraheader", `AUTHORIZATION: basic x-access-token:${token}`])
  }
 
+ // Checkout the branch which should be pushed.
+ await exec.exec("git", ["checkout", branch])
+
+ // Loop specified number of tries.
  for (let i = 0; i < tries; i++) {
  try {
- await exec.exec("git", ["push"])
+ // Try to push, if successful, then checkout previous branch and just exit.
+ await exec.exec("git", ["push", remote, branch])
+ await exec.exec("git", ["checkout", "-"])
  return
  } catch (error) {
- await exec.exec("git", ["pull", "--rebase"])
+ // Push failed. Wait some time, pull changes with rebasing and try again.
+ const delay = Math.floor(Math.random() * (10 + i)) + 3
+ await exec.exec("sleep", [delay])
+ await exec.exec("git", ["pull", "--rebase", remote, branch])
  }
  }
 
- throw "Max tries reached"
+ // This should never be reached.
+ throw new Error("Max tries reached")
  } catch (error) {
  core.setFailed(error.message)
  }