Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: update main to be default #491

Merged
merged 1 commit into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Add a new deployment from the provided configuration

**--parameter, -p**="": provide the parameter(s) within `key=value` format for the deployment

**--ref**="": provide the reference to deploy - this can be a branch, commit (SHA) or tag (default: refs/heads/master)
**--ref**="": provide the reference to deploy - this can be a branch, commit (SHA) or tag (default: refs/heads/main)

**--repo, -r**="": provide the repository for the deployment

Expand All @@ -91,7 +91,7 @@ Add a new repository from the provided configuration

**--active, -a**="": current status of the repository (default: true)

**--branch, -b**="": default branch for the repository (default: master)
**--branch, -b**="": default branch for the repository (default: main)

**--clone, -c**="": full clone URL to repository in source control

Expand Down Expand Up @@ -183,7 +183,7 @@ Compile the provided pipeline

**--output, --op**="": format the output in json, spew or yaml (default: yaml)

**--ref**="": provide the repository reference for the pipeline (default: master)
**--ref**="": provide the repository reference for the pipeline (default: main)

**--repo, -r**="": provide the repository for the pipeline

Expand Down Expand Up @@ -213,7 +213,7 @@ Expand the provided pipeline

**--output, --op**="": format the output in json, spew or yaml (default: yaml)

**--ref**="": provide the repository reference for the pipeline (default: master)
**--ref**="": provide the repository reference for the pipeline (default: main)

**--repo, -r**="": provide the repository for the pipeline

Expand Down Expand Up @@ -511,7 +511,7 @@ Update a new repository from the provided configuration

**--active, -a**="": current status of the repository (default: true)

**--branch, -b**="": default branch for the repository (default: master)
**--branch, -b**="": default branch for the repository (default: main)

**--clone, -c**="": full clone URL to repository in source control

Expand Down Expand Up @@ -575,7 +575,7 @@ Validate a Vela pipeline

**--path, -p**="": provide the path to the file for the pipeline

**--ref**="": provide the repository reference for the pipeline (default: master)
**--ref**="": provide the repository reference for the pipeline (default: main)

**--repo, -r**="": provide the repository for the pipeline

Expand Down Expand Up @@ -649,7 +649,7 @@ View details of the provided pipeline

**--output, --op**="": format the output in json, spew or yaml (default: yaml)

**--ref**="": provide the repository reference for the pipeline (default: master)
**--ref**="": provide the repository reference for the pipeline (default: main)

**--repo, -r**="": provide the repository for the pipeline

Expand Down
2 changes: 1 addition & 1 deletion action/build/get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestBuild_Config_Get(t *testing.T) {
Action: "get",
Org: "github",
Repo: "octocat",
Branch: "master",
Branch: "main",
Page: 1,
PerPage: 10,
Output: "dump",
Expand Down
4 changes: 2 additions & 2 deletions action/build/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ func testBuild() *library.Build {
b.SetAuthor("OctoKitty")
b.SetEmail("[email protected]")
b.SetLink("https://example.company.com/github/octocat/1")
b.SetBranch("master")
b.SetRef("refs/heads/master")
b.SetBranch("main")
b.SetRef("refs/heads/main")
b.SetBaseRef("")
b.SetHost("example.company.com")
b.SetRuntime("docker")
Expand Down
12 changes: 6 additions & 6 deletions action/deployment/add_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestDeployment_Config_Add(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "",
Expand All @@ -47,7 +47,7 @@ func TestDeployment_Config_Add(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "dump",
Expand All @@ -60,7 +60,7 @@ func TestDeployment_Config_Add(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "json",
Expand All @@ -73,7 +73,7 @@ func TestDeployment_Config_Add(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "spew",
Expand All @@ -86,7 +86,7 @@ func TestDeployment_Config_Add(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "yaml",
Expand All @@ -100,7 +100,7 @@ func TestDeployment_Config_Add(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "yaml",
Expand Down
2 changes: 1 addition & 1 deletion action/deployment/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func testDeployment() *library.Deployment {
d.SetURL("https://api.github.com/repos/github/octocat/deployments/1")
d.SetUser("octocat")
d.SetCommit("48afb5bdc41ad69bf22588491333f7cf71135163")
d.SetRef("refs/heads/master")
d.SetRef("refs/heads/main")
d.SetTask("vela-deploy")
d.SetTarget("production")
d.SetDescription("Deployment request from Vela")
Expand Down
4 changes: 2 additions & 2 deletions action/deployment/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestDeployment_Config_Validate(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Target: "production",
Task: "deploy:vela",
Output: "",
Expand Down Expand Up @@ -65,7 +65,7 @@ func TestDeployment_Config_Validate(t *testing.T) {
Org: "github",
Repo: "octocat",
Description: "Deployment request from Vela",
Ref: "refs/heads/master",
Ref: "refs/heads/main",
Task: "deploy:vela",
Output: "",
},
Expand Down
2 changes: 1 addition & 1 deletion action/hook/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func testHook() *library.Hook {
h.SetCreated(time.Now().UTC().Unix())
h.SetHost("github.com")
h.SetEvent("push")
h.SetBranch("master")
h.SetBranch("main")
h.SetError("")
h.SetStatus("success")
h.SetLink("https://github.com/github/octocat/settings/hooks/1")
Expand Down
2 changes: 1 addition & 1 deletion action/pipeline/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func testPipeline() *library.Pipeline {
p.SetCommit("48afb5bdc41ad69bf22588491333f7cf71135163")
p.SetFlavor("large")
p.SetPlatform("docker")
p.SetRef("refs/heads/master")
p.SetRef("refs/heads/main")
p.SetRef("yaml")
p.SetVersion("1")
p.SetExternalSecrets(false)
Expand Down
10 changes: 5 additions & 5 deletions action/repo/add_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestRepo_Config_Add(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Counter: 0,
Expand All @@ -55,7 +55,7 @@ func TestRepo_Config_Add(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Counter: 0,
Expand All @@ -76,7 +76,7 @@ func TestRepo_Config_Add(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand All @@ -96,7 +96,7 @@ func TestRepo_Config_Add(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Counter: 0,
Expand All @@ -117,7 +117,7 @@ func TestRepo_Config_Add(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Counter: 0,
Expand Down
2 changes: 1 addition & 1 deletion action/repo/table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func testRepo() *library.Repo {
r.SetFullName("github/octocat")
r.SetLink("https://github.com/github/octocat")
r.SetClone("https://github.com/github/octocat.git")
r.SetBranch("master")
r.SetBranch("main")
r.SetTimeout(30)
r.SetVisibility("public")
r.SetPrivate(false)
Expand Down
12 changes: 6 additions & 6 deletions action/repo/update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestRepo_Config_Update(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand All @@ -54,7 +54,7 @@ func TestRepo_Config_Update(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand All @@ -74,7 +74,7 @@ func TestRepo_Config_Update(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand All @@ -94,7 +94,7 @@ func TestRepo_Config_Update(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand All @@ -114,7 +114,7 @@ func TestRepo_Config_Update(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand All @@ -134,7 +134,7 @@ func TestRepo_Config_Update(t *testing.T) {
Name: "not-found",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
BuildLimit: 10,
Timeout: 60,
Visibility: "public",
Expand Down
4 changes: 2 additions & 2 deletions action/repo/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestRepo_Config_Validate(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
Timeout: 60,
Visibility: "public",
Private: false,
Expand Down Expand Up @@ -75,7 +75,7 @@ func TestRepo_Config_Validate(t *testing.T) {
Name: "octocat",
Link: "https://github.com/github/octocat",
Clone: "https://github.com/github/octocat.git",
Branch: "master",
Branch: "main",
Timeout: 60,
Visibility: "public",
Private: false,
Expand Down
2 changes: 1 addition & 1 deletion command/pipeline/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var CommandCompile = &cli.Command{
EnvVars: []string{"VELA_REF", "PIPELINE_REF"},
Name: "ref",
Usage: "provide the repository reference for the pipeline",
Value: "master",
Value: "main",
},
},
CustomHelpTemplate: fmt.Sprintf(`%s
Expand Down
2 changes: 1 addition & 1 deletion command/pipeline/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ EXAMPLES:
3. Execute a local Vela pipeline in a specific directory.
$ {{.HelpName}} --path /absolute/full/path/to/dir --file .vela.local.yml
4. Execute a local Vela pipeline with ruleset information.
$ {{.HelpName}} --branch master --event push
$ {{.HelpName}} --branch main --event push
5. Execute a local Vela pipeline with a read-only local volume.
$ {{.HelpName}} --volume /tmp/foo.txt:/tmp/foo.txt:ro
6. Execute a local Vela pipeline with a writeable local volume.
Expand Down
2 changes: 1 addition & 1 deletion command/pipeline/expand.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ var CommandExpand = &cli.Command{
EnvVars: []string{"VELA_REF", "PIPELINE_REF"},
Name: "ref",
Usage: "provide the repository reference for the pipeline",
Value: "master",
Value: "main",
},
},
CustomHelpTemplate: fmt.Sprintf(`%s
Expand Down
2 changes: 1 addition & 1 deletion command/pipeline/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var CommandValidate = &cli.Command{
EnvVars: []string{"VELA_REF", "PIPELINE_REF"},
Name: "ref",
Usage: "provide the repository reference for the pipeline",
Value: "master",
Value: "main",
},
&cli.BoolFlag{
EnvVars: []string{"VELA_TEMPLATE", "PIPELINE_TEMPLATE"},
Expand Down
2 changes: 1 addition & 1 deletion command/repo/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var CommandAdd = &cli.Command{
Name: "branch",
Aliases: []string{"b"},
Usage: "default branch for the repository",
Value: "master",
Value: "main",
},
&cli.StringFlag{
EnvVars: []string{"VELA_LINK", "REPO_LINK"},
Expand Down
2 changes: 1 addition & 1 deletion command/repo/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var CommandUpdate = &cli.Command{
Name: "branch",
Aliases: []string{"b"},
Usage: "default branch for the repository",
Value: "master",
Value: "main",
},
&cli.StringFlag{
EnvVars: []string{"VELA_LINK", "REPO_LINK"},
Expand Down