Skip to content

Commit 2ee441d

Browse files
authored
Merge pull request #342 from kzys/rename-branch
Rename master to main
2 parents 647aa41 + 62f8102 commit 2ee441d

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

.buildkite/pipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ steps:
116116
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
117117
hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
118118

119-
- label: ':hammer: test against firecracker master'
119+
- label: ':hammer: test against firecracker main'
120120
env:
121-
FC_TEST_BIN: "${FC_TEST_DATA_PATH}/firecracker-master"
122-
FC_TEST_JAILER_BIN: "${FC_TEST_DATA_PATH}/jailer-master"
121+
FC_TEST_BIN: "${FC_TEST_DATA_PATH}/firecracker-main"
122+
FC_TEST_JAILER_BIN: "${FC_TEST_DATA_PATH}/jailer-main"
123123
DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
124124
commands:
125125
- "sudo -E PATH=$PATH FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="

.github/workflows/go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010

CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail
2323
## Contributing via Pull Requests
2424
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
2525

26-
1. You are working against the latest source on the *master* branch.
26+
1. You are working against the latest source on the *main* branch.
2727
2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
2828
3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
2929

@@ -56,6 +56,7 @@ If you discover a potential security issue in this project we ask that you notif
5656

5757
## Licensing
5858

59-
See the [LICENSE](https://github.com/firecracker-microvm/firecracker-go-sdk/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
59+
See the [LICENSE](https://github.com/firecracker-microvm/firecracker-go-sdk/blob/main/LICENSE) file for
60+
our project's licensing. We will ask you to confirm the licensing of your contribution.
6061

6162
We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ FIRECRACKER_BUILDER_NAME=firecracker-builder
2020
FIRECRACKER_TARGET?=x86_64-unknown-linux-musl
2121

2222
FC_TEST_DATA_PATH?=testdata
23-
FIRECRACKER_BIN=$(FC_TEST_DATA_PATH)/firecracker-master
24-
JAILER_BIN=$(FC_TEST_DATA_PATH)/jailer-master
23+
FIRECRACKER_BIN=$(FC_TEST_DATA_PATH)/firecracker-main
24+
JAILER_BIN=$(FC_TEST_DATA_PATH)/jailer-main
2525

2626
UID = $(shell id -u)
2727
GID = $(shell id -g)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
A basic Go interface to the Firecracker API
22
====
33

4-
[![Build status](https://badge.buildkite.com/de08ca676829bedbf6de040c2c2ba1a5d2892e220997c2abdd.svg?branch=master)](https://buildkite.com/firecracker-microvm/firecracker-go-sdk)
4+
[![Build status](https://badge.buildkite.com/de08ca676829bedbf6de040c2c2ba1a5d2892e220997c2abdd.svg?branch=main)](https://buildkite.com/firecracker-microvm/firecracker-go-sdk)
55
[![GoDoc](https://godoc.org/github.com/firecracker-microvm/firecracker-go-sdk?status.svg)](https://godoc.org/github.com/firecracker-microvm/firecracker-go-sdk)
66

77
This package is a Go library to interact with the Firecracker API. It
@@ -160,7 +160,7 @@ to report problems, discuss roadmap items, or make feature requests.
160160
If you've discovered an issue that may have security implications to
161161
users or developers of this software, please do not report it using
162162
GitHub issues, but instead follow
163-
[Firecracker's security reporting guidelines](https://github.com/firecracker-microvm/firecracker/blob/master/SECURITY.md).
163+
[Firecracker's security reporting guidelines](https://github.com/firecracker-microvm/firecracker/blob/main/SECURITY.md).
164164

165165
Other discussion: For general discussion, please join us in the
166166
`#general` channel on the [Firecracker Slack](https://join.slack.com/t/firecracker-microvm/shared_invite/zt-oxbm7tqt-GLlze9zZ7sdRSDY6OnXXHg).

0 commit comments

Comments
 (0)