Skip to content

Commit

Permalink
Add github action to merge main into master
Browse files Browse the repository at this point in the history
so we don't break the world
  • Loading branch information
Jeremy Price committed Oct 5, 2023
1 parent 8384786 commit 182c395
Showing 1 changed file with 42 additions and 0 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/branch_updater.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This is a basic workflow to help you get started with Actions

name: Update follower branch

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
name:
description: 'copy to master'
required: true
default: 'Master'

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# Runs a set of commands using the runners shell
- name: Run a multi-line script
run: |
git fetch -a
git checkout main
git pull
git checkout master
git merge main
git push origin master
#git branch -f main-follower
#git checkout main-follower
#git push --force origin main-follower

0 comments on commit 182c395

Please sign in to comment.