Merge pull request #284 from panjf2000/dev

Sync recent changes
This commit is contained in:
Andy Pan 2023-06-30 21:37:23 +08:00 committed by GitHub
commit 78ff6e0213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 60 additions and 1 deletions

View File

@ -64,6 +64,22 @@ body:
- BSD
validations:
required: true
- type: input
id: os-version
attributes:
label: OS version
description: What's the specific version of OS?
placeholder: "Run `uname -srm` command to get the info, for example: Darwin 21.5.0 arm64, Linux 5.4.0-137-generic x86_64"
validations:
required: true
- type: input
id: go-version
attributes:
label: Go version
description: What's the specific version of Go?
placeholder: "Run `go version` command to get the info, for example: go1.20.5 linux/amd64"
validations:
required: true
- type: textarea
id: logs
attributes:

View File

@ -7,12 +7,22 @@ on:
- dev
paths-ignore:
- '**.md'
- '.github/FUNDING.yml'
- '.github/release-drafter.yml'
- '.github/ISSUE_TEMPLATE/*'
- '.github/workflows/pull-request.yml'
- '.github/workflows/release-drafter.yml'
pull_request:
branches:
- master
- dev
paths-ignore:
- '**.md'
- '.github/FUNDING.yml'
- '.github/release-drafter.yml'
- '.github/ISSUE_TEMPLATE/*'
- '.github/workflows/pull-request.yml'
- '.github/workflows/release-drafter.yml'
schedule:
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)

19
.github/workflows/pull-request.yml vendored Normal file
View File

@ -0,0 +1,19 @@
name: Check pull request target
on:
pull_request:
types:
- opened
- reopened
- synchronize
branches:
- master
jobs:
check-branches:
runs-on: ubuntu-latest
steps:
- name: Check target branch
run: |
if [ ${{ github.head_ref }} != "dev" ]; then
echo "Only pull requests from dev branch are only allowed to be merged into master branch."
exit 1
fi

View File

@ -7,12 +7,26 @@ on:
- dev
paths-ignore:
- '**.md'
- '.github/FUNDING.yml'
- '.github/release-drafter.yml'
- '.github/ISSUE_TEMPLATE/*'
- '.github/workflows/codeql.yml'
- '.github/workflows/pull-request.yml'
- '.github/workflows/release-drafter.yml'
- 'examples/*'
pull_request:
branches:
- master
- dev
paths-ignore:
- '**.md'
- '.github/FUNDING.yml'
- '.github/release-drafter.yml'
- '.github/ISSUE_TEMPLATE/*'
- '.github/workflows/codeql.yml'
- '.github/workflows/pull-request.yml'
- '.github/workflows/release-drafter.yml'
- 'examples/*'
env:
GO111MODULE: on

View File

@ -6,7 +6,7 @@
- Review existing issues and provide feedback or react to them.
## With pull requests:
- Open your pull request against `master`.
- Open your pull request against `dev`.
- Open one pull request for only one feature/proposal, if you have several those, please put them into different PRs, whereas you are allowed to open one pull request with several bug-fixs.
- Your pull request should have no more than two commits, if not, you should squash them.
- It should pass all tests in the available continuous integrations systems such as TravisCI.