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

ci: setup workflows for release-1.x branch #286

Merged
merged 1 commit into from
Jul 12, 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
26 changes: 26 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Backport
on:
pull_request_target:
types:
- closed
- labeled

jobs:
backport:
name: Backport
runs-on: ubuntu-latest
# Only react to merged PRs for security reasons.
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
if: >
github.event.pull_request.merged
&& (
github.event.action == 'closed'
|| (
github.event.action == 'labeled'
&& contains(github.event.label.name, 'backport')
)
)
steps:
- uses: tibdex/backport@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: Continuous Integration
on: [push, pull_request]
on:
pull_request:
push:
branches:
- main
- release-1.x

jobs:
build:
name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
tags:
- v*
branches:
- master
- main
- release-1.x
pull_request:
jobs:
golangci:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ on:
push:
branches:
- main
- release-1.x

name: release-please

jobs:
Expand All @@ -18,3 +20,6 @@ jobs:
# we need to write it to a file that is included in the git tag.
extra-files: |
hcloud/hcloud.go

# Configuration for multiple active release branches
default-branch: ${{ github.ref_name }}
11 changes: 11 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Maintainers Guide

This guide is intended for _maintainers_.

## Release Branches

All development targets the `main` branch. New releases for the 2.x series are cut from this.

For the 1.x series which will be supported until at least September 1 2023 we also have a `release-1.x` branch where we try to backport all bug fixes.

Backports are done by [tibdex/backport](https://github.com/tibdex/backport). Apply the label `backport release-1.x` to the PRs and once they are merged a new PR is opened.