Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Maxime Heckel 0765d9535a
Merge pull request #34 from constgen/workflow-update
Update workflow dependencies
2023-01-23 22:15:23 -05:00
.github/workflows Update workflow dependencies 2023-01-21 02:40:50 +02:00
dist fix: fixed error thrown when running using a scheduled workflow 2020-09-29 11:47:48 +02:00
docs chore(release): 1.1.0 [skip ci] 2020-03-19 23:28:48 +00:00
node_modules feat(action): Cleaner error output 2020-03-19 19:25:04 -04:00
.eslintrc.js feat: Create merge fast forward only github action 2020-03-12 20:50:30 -04:00
.prettierrc feat: Create merge fast forward only github action 2020-03-12 20:50:30 -04:00
.releaserc fix(release): Fix release workflow 2020-03-19 18:35:17 -04:00
action.yml Upgrade runtime Node version to 16 2023-01-16 22:18:25 +02:00
index.ts fix: fixed error thrown when running using a scheduled workflow 2020-09-29 11:47:48 +02:00
package.json chore(release): 1.1.0 [skip ci] 2020-03-19 23:28:48 +00:00
README.md Enable syntax higlight for config example 2022-01-25 14:27:02 +02:00
tsconfig.json feat: Create merge fast forward only github action 2020-03-12 20:50:30 -04:00
yarn.lock chore(deps): bump npm from 6.14.2 to 6.14.6 2020-07-07 21:07:52 +00:00

Merge Fast Forward (Github Action)

A simple Github action for run git merge --ff-only BRANCH in a Github CI workflow

Example

Example configuration:

name: 'Merge to Development'
on:
  workflow_dispatch:
  # Optional: A schedule like this would run the merge every night
  schedule:
    - cron:  '0 0 * * *'
  # Add any other trigger you'd like
jobs:
  merge:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v2
        with:
          # Fetch the whole history to prevent unrelated history errors
          fetch-depth: '0'
          # The branch you want to checkout (usually equal to `branchtomerge`)
          ref: 'master'
      - name: Merge Fast Forward
        uses: MaximeHeckel/github-action-merge-fast-forward@v1.1.0
        with:
          # Branch to merge
          branchtomerge: master
          # Branch that will be updated
          branch: release
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}