diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2021-05-19 10:47:06 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2021-05-19 10:47:06 -0600 |
| commit | c052162203654d9fcb6f3a40b1c9b376b8e618d1 (patch) | |
| tree | ed168c63505b98d378d2513b2a235742701d1db9 /.github | |
| parent | 7f26a6b3e507cef98c2d4a74384bacf53bc58f57 (diff) | |
| parent | b82db994f39c6991d673a7ae9836f5454b1f9668 (diff) | |
Merge branch '2.4'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cross-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22e7d7e..9a46b80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,9 +6,11 @@ on: push: branches: - master + - 2.* pull_request: branches: - master + - 2.* jobs: test: diff --git a/.github/workflows/cross-build.yml b/.github/workflows/cross-build.yml index 4da0a25..dc6b8e3 100644 --- a/.github/workflows/cross-build.yml +++ b/.github/workflows/cross-build.yml @@ -4,9 +4,11 @@ on: push: branches: - master + - 2.* pull_request: branches: - master + - 2.* jobs: cross-build-test: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ef69150..4b4ed03 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,9 +4,11 @@ on: push: branches: - master + - 2.* pull_request: branches: - master + - 2.* jobs: # From https://github.com/golangci/golangci-lint-action |