Skip to content
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
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ make clean

```bash
# push your code up to your fork
git push fork master
git push fork main
```

* Make sure to follow our [PR process](https://go-vela.github.io/docs/community/contributing_guidelines/#development-workflow) when opening a pull request
Expand Down
2 changes: 1 addition & 1 deletion .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![license](https://img.shields.io/crates/l/gl.svg)](../LICENSE)
[![GoDoc](https://godoc.org/github.com/go-vela/server?status.svg)](https://godoc.org/github.com/go-vela/server)
[![Go Report Card](https://goreportcard.com/badge/go-vela/server)](https://goreportcard.com/report/go-vela/server)
[![codecov](https://codecov.io/gh/go-vela/server/branch/master/graph/badge.svg)](https://codecov.io/gh/go-vela/server)
[![codecov](https://codecov.io/gh/go-vela/server/branch/main/graph/badge.svg)](https://codecov.io/gh/go-vela/server)

> Vela is in active development and is a pre-release product.
>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]
schedule:
- cron: '23 1 * * 0'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# name of the action
name: publish

# trigger on push events with branch master
# trigger on push events with branch main
on:
push:
branches: [ master ]
branches: [ main ]

# pipeline to execute
jobs:
Expand Down
2 changes: 1 addition & 1 deletion queue/redis/redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

// The following functions were taken from
// https://github.com/go-vela/sdk-go/blob/master/vela/go
// https://github.com/go-vela/sdk-go/blob/main/vela/go
// which is the only reason go-vela/sdk-go is
// a dependency for go-vela/server
// TODO: consider moving to go-vela/types?
Expand Down
2 changes: 1 addition & 1 deletion queue/redis/route.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func (c *client) Route(w *pipeline.Worker) (string, error) {

// if pipline does not specify route information return default
//
// https://github.com/go-vela/types/blob/master/constants/queue.go#L10
// https://github.com/go-vela/types/blob/main/constants/queue.go#L10
if w.Empty() {
return constants.DefaultRoute, nil
}
Expand Down