-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add github action for merging main branch
The main branch was renamed from master to main, the workflow will merge changes across to master for now in case there are forks which use master. Also update CI badge Removes some old dependency files, now that Go modules are used by all supported versions. Also removes appveyor CI. Either CircleCI or github actions would do for windows builds.
- Loading branch information
Showing
6 changed files
with
19 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.