Skip to content

Commit 9b43fbe

Browse files
authored
Merge pull request #370 from bgilbert/rename
*: rename master branch to main
2 parents 777e73a + 320a3bd commit 9b43fbe

File tree

5 files changed

+6
-51
lines changed

5 files changed

+6
-51
lines changed

.github/workflows/containers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Containers
33

44
on:
55
push:
6-
branches: [master]
6+
branches: [main]
77
pull_request:
8-
branches: [master]
8+
branches: [main]
99

1010
env:
1111
GO_TOOLCHAIN: "1.15"

.github/workflows/go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
name: Go
33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
env:
1010
# Minimum supported Go toolchain

CONTRIBUTING.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ are very busy and read the mailing lists.
3131

3232
This is a rough outline of what a contributor's workflow looks like:
3333

34-
- Create a topic branch from where you want to base your work (usually master).
34+
- Create a topic branch from where you want to base your work (usually main).
3535
- Make commits of logical units.
3636
- Make sure your commit messages are in the proper format (see below).
3737
- Push your changes to a topic branch in your fork of the repository.
@@ -40,12 +40,6 @@ This is a rough outline of what a contributor's workflow looks like:
4040

4141
Thanks for your contributions!
4242

43-
### Coding Style
44-
45-
CoreOS projects written in Go follow a set of style guidelines that we've documented
46-
[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when
47-
working on your contributions.
48-
4943
### Format of the Commit Message
5044

5145
We follow a rough convention for commit messages that is designed to answer two

Jenkinsfile

Lines changed: 0 additions & 38 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# go-systemd
22

3-
[![Build Status](https://travis-ci.org/coreos/go-systemd.png?branch=master)](https://travis-ci.org/coreos/go-systemd)
43
[![godoc](https://img.shields.io/badge/godoc-reference-5272B4)](https://pkg.go.dev/mod/github.com/coreos/go-systemd/v22/?tab=packages)
54
![minimum golang 1.12](https://img.shields.io/badge/golang-1.12%2B-orange.svg)
65

@@ -20,7 +19,7 @@ Go bindings to systemd. The project has several packages:
2019

2120
An example HTTP server using socket activation can be quickly set up by following this README on a Linux machine running systemd:
2221

23-
https://github.com/coreos/go-systemd/tree/master/examples/activation/httpserver
22+
https://github.com/coreos/go-systemd/tree/main/examples/activation/httpserver
2423

2524
## systemd Service Notification
2625

0 commit comments

Comments
 (0)