Skip to content

Commit

Permalink
Merge pull request #158 from dnephin/add-main-branch-sync
Browse files Browse the repository at this point in the history
Add github action to sync main
  • Loading branch information
dnephin committed Oct 31, 2020
2 parents a37fa33 + 7ccf086 commit b081783
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions .github/workflows/sync-main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Merge main into master

on:
push:
branches: [main]

jobs:
sync:
name: Merge main branch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with: {fetch-depth: 0}
- name: merge
run: |
git checkout master
git merge --ff-only main
git push origin master
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ gotestsum --watch --format testname
## Development

[![Godoc](https://godoc.org/gotest.tools/gotestsum?status.svg)](https://pkg.go.dev/gotest.tools/gotestsum?tab=subdirectories)
[![CircleCI](https://circleci.com/gh/gotestyourself/gotestsum/tree/master.svg?style=shield)](https://circleci.com/gh/gotestyourself/gotestsum/tree/master)
[![CircleCI](https://circleci.com/gh/gotestyourself/gotestsum/tree/main.svg?style=shield)](https://circleci.com/gh/gotestyourself/gotestsum/tree/main)
[![Go Reportcard](https://goreportcard.com/badge/gotest.tools/gotestsum)](https://goreportcard.com/report/gotest.tools/gotestsum)

Pull requests and bug reports are welcome! Please open an issue first for any
Expand Down

0 comments on commit b081783

Please sign in to comment.