git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge branch 'master' into nextcloud-provider
commit3a8b33a017f3cd61c7a457db10bf4289d9332c3f authorJoel Speed <Joel.speed@hotmail.co.uk> dateTue 17 Dec 2019, 11:56 (7 years ago) parent227ea5d1fb6fb8
4 files changed+74−3
CHANGELOG.md+24 README.md+1−1 RELEASE.md+47 dist.sh+2−2
CHANGELOG.md+24
@@ -1,5 +1,28 @@
11# Vx.x.x (Pre-release)
22
3+## Important Notes
4+
5+## Breaking Changes
6+
7+## Changes since v4.1.0
8+- [#325](https://github.com/pusher/oauth2_proxy/pull/325) dist.sh: use sha256sum (@syscll)
9+
10+# v4.1.0
11+
12+## Release Highlights
13+- Added Keycloak provider
14+- Build on Go 1.13
15+- Upgrade Docker image to use Debian Buster
16+- Added support for FreeBSD builds
17+- Added new logo
18+- Added support for GitHub teams
19+
20+## Important Notes
21+N/A
22+
23+## Breaking Changes
24+N/A
25+
326## Changes since v4.0.0
427- [#292](https://github.com/pusher/oauth2_proxy/pull/292) Added bash >= 4.0 dependency to configure script (@jmfrank63)
528- [#227](https://github.com/pusher/oauth2_proxy/pull/227) Add Keycloak provider (@Ofinka)
@@ -18,6 +41,7 @@
1841- [#248](https://github.com/pusher/oauth2_proxy/pull/248) Fix issue with X-Auth-Request-Redirect header being ignored (@webnard)
1942- [#314](https://github.com/pusher/oauth2_proxy/pull/314) Add redirect capability to sign_out (@costelmoraru)
2043- [#265](https://github.com/pusher/oauth2_proxy/pull/265) Add upstream with static response (@cgroschupp)
44+- [#317](https://github.com/pusher/oauth2_proxy/pull/317) Add build for FreeBSD (@fnkr)
2145- [#296](https://github.com/pusher/oauth2_proxy/pull/296) Allow to override provider's name for sign-in page (@ffdybuster)
2246
2347# v4.0.0
README.md+1−1
@@ -47,4 +47,4 @@ If you would like to reach out to the maintainers, come talk to us in the `#oaut
4747
4848## Contributing
4949
50−Please see our [Contributing](CONTRIBUTING.md) guidelines.
50+Please see our [Contributing](CONTRIBUTING.md) guidelines. For releasing see our [release creation guide](RELEASE.md).
RELEASE.mdnew file+47
@@ -0,0 +1,47 @@
1+# Release
2+
3+Here's how OAuth2_Proxy releases are created.
4+
5+## Schedule
6+
7+Our aim is to release once a quarter, but bug fixes will be prioritised and might be released earlier.
8+
9+## The Process
10+
11+Note this uses `v4.1.0` as an example release number.
12+
13+1. Create a draft Github release
14+ * Use format `v4.1.0` for both the tag and title
15+2. Update [CHANGELOG.md](CHANGELOG.md)
16+ * Write the release highlights
17+ * Copy in headings ready for the next release
18+3. Create release commit
19+ ```
20+ git checkout -b release-v4.1.0
21+ ```
22+4. Create pull request getting other maintainers to review
23+5. Copy the release notes in to the draft Github release, adding a link to [CHANGELOG.md](CHANGELOG.md)
24+6. Update you local master branch
25+ ```
26+ git checkout master
27+ git pull
28+ ```
29+7. Create & push the tag
30+ ```
31+ git tag v4.1.0
32+ git push --tags
33+ ```
34+8. Make the release artefacts
35+ ```
36+ make release
37+ ```
38+9. Upload all the files (not the folders) from the `/release` folder to Github release as binary artefacts. There should be both the tarballs (`tar.gz`) and the checksum files (`sha256sum.txt`).
39+10. Publish release in Github
40+11. Make and push docker images to Quay
41+ ```
42+ make docker-all
43+ make docker-push-all
44+ ```
45+ Note: Ensure the docker tags don't include `-dirty`. This means you have uncommitted changes.
46+
47+12. Verify everything looks good at [quay](https://quay.io/repository/pusher/oauth2_proxy?tag=latest&tab=tags) and [github](https://github.com/pusher/oauth2_proxy/releases)
dist.sh+2−2
@@ -14,7 +14,7 @@ if [[ ! "${GO_VERSION}" =~ ^go1.13.* ]]; then
1414 exit 1
1515fi
1616
17−ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 windows-amd64)
17+ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 freebsd-amd64 windows-amd64)
1818
1919mkdir -p release
2020
@@ -37,7 +37,7 @@ for ARCH in "${ARCHS[@]}"; do
3737 cd release
3838
3939 # Create sha256sum for architecture specific binary
40− shasum -a 256 ${BINARY}-${VERSION}.${ARCH}.${GO_VERSION}/${BINARY} > ${BINARY}-${VERSION}.${ARCH}-sha256sum.txt
40+ sha256sum ${BINARY}-${VERSION}.${ARCH}.${GO_VERSION}/${BINARY} > ${BINARY}-${VERSION}.${ARCH}-sha256sum.txt
4141
4242 # Create tar file for architecture specific binary
4343 tar -czvf ${BINARY}-${VERSION}.${ARCH}.${GO_VERSION}.tar.gz ${BINARY}-${VERSION}.${ARCH}.${GO_VERSION}