Skip to content

Commit

Permalink
Merge branch 'master' into pre-release-version-bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
krancour authored Jul 14, 2021
2 parents 5a0d179 + de0d2b0 commit 3a48da9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ should adjust this value to match a repository into which you have installed
your new GitHub App.

```yaml
apiVersion: brigade.sh/v2-alpha.5
apiVersion: brigade.sh/v2-beta
kind: Project
metadata:
id: github-demo
Expand Down Expand Up @@ -296,7 +296,7 @@ repository; not when they start watching it. This is a peculiarity of GitHub and
not a peculiarity of this gateway.)

```yaml
apiVersion: brigade.sh/v2-alpha.5
apiVersion: brigade.sh/v2-beta
kind: Project
metadata:
id: github-demo
Expand Down
2 changes: 1 addition & 1 deletion examples/example.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/brigadecore/brigade/v2/v2/apiserver/schemas/project.json
apiVersion: brigade.sh/v2-alpha.5
apiVersion: brigade.sh/v2-beta
kind: Project
metadata:
id: github-demo
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace k8s.io/client-go => k8s.io/client-go v0.18.2

require (
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
github.com/brigadecore/brigade/sdk/v2 v2.0.0-alpha.5.0.20210614205223-c89ad0ef0260
github.com/brigadecore/brigade/sdk/v2 v2.0.0-beta.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/google/go-github/v33 v33.0.0
github.com/gorilla/mux v1.8.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs=
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/brigadecore/brigade/sdk/v2 v2.0.0-alpha.5.0.20210614205223-c89ad0ef0260 h1:BuuzEs84uw06myuo4G2j+fLiXMjwS/pXFDNp9i6e1Ds=
github.com/brigadecore/brigade/sdk/v2 v2.0.0-alpha.5.0.20210614205223-c89ad0ef0260/go.mod h1:rB3y/pIheORX5AHbxaSAw5Xr/U6bUAUtSLkgJcbOHIY=
github.com/brigadecore/brigade/sdk/v2 v2.0.0-beta.1 h1:diVZz6uGMAS2eImx39A15ZRP2eoitiC4TbhcgNVUwIg=
github.com/brigadecore/brigade/sdk/v2 v2.0.0-beta.1/go.mod h1:rB3y/pIheORX5AHbxaSAw5Xr/U6bUAUtSLkgJcbOHIY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down

0 comments on commit 3a48da9

Please sign in to comment.