This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 8772e709b [improve] auto label when pr, update asf config (#1749)
8772e709b is described below
commit 8772e709ba24a06ecf64fe93ca223a744d89b66d
Author: tomsun28 <[email protected]>
AuthorDate: Mon Apr 15 19:58:27 2024 +0800
[improve] auto label when pr, update asf config (#1749)
---
.asf.yaml | 19 ++-
.github/PULL_REQUEST_TEMPLATE.md | 2 +-
.github/labeler.yml | 130 +++++++++++++++++++++
.github/workflows/backend-build-test.yml | 11 --
...{backend-build-test.yml => license-checker.yml} | 40 +------
.github/workflows/pull-request-robot.yml | 34 ++++++
6 files changed, 182 insertions(+), 54 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 93fe1a6bc..0b063ff73 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -16,16 +16,29 @@
#
github:
- description: HertzBeat is a real-time monitoring system with agentless,
performance cluster, prometheus-compatible, custom monitoring and status page
building capabilities.
+ description: Apache HertzBeat is a real-time monitoring system with
agentless, performance cluster, prometheus-compatible, custom monitoring and
status page building capabilities.
homepage: https://hertzbeat.apache.org/
labels:
- monitoring
- monitor
+ - notifications
+ - alerting
- self-hosted
- - status
- prometheus
+ - zabbix
+ - grafana
+ - metrics
+ - observability
+ - uptime
- uptime-monitoring
+ - status
- status-page
+ - devops
+ - server
+ - linux
+ - database
+ - mysql
+ - cloud
enabled_merge_buttons:
squash: true
merge: false
@@ -33,7 +46,7 @@ github:
protected_branches:
master:
required_status_checks:
- strict: false
+ strict: true
required_pull_request_reviews:
dismiss_stale_reviews: true
required_approving_review_count: 1
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index aece4a3cf..de0ad689b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,7 +5,7 @@
## Checklist
-- [ ] I have read the [Contributing
Guide](https://hertzbeat.com/docs/others/contributing/)
+- [ ] I have read the [Contributing
Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide)
- [ ] I have written the necessary doc or comment.
- [ ] I have added the necessary unit tests and all cases have passed.
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..90a3932a9
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,130 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+infra:
+ - changed-files:
+ - any-glob-to-any-file:
+ - ".github/**/*"
+ - ".asf.yaml"
+ - ".gitignore"
+ - ".licenserc.yaml"
+ - "SECURITY.md"
+ - "CODE_OF_CONDUCT.md"
+ - "CONTRIBUTING.md"
+
+license:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "material/licenses/**/*"
+ - "LICENSE"
+ - "NOTICE"
+
+script:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "script/**/*"
+
+helm:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "script/helm/**/*"
+
+kubernetes:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "script/helm/**/*"
+
+build:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "script/assembly/**/*"
+
+docker:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "script/docker/**/*"
+ - "script/docker-compose/**/*"
+
+docker-compose:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "script/docker-compose/**/*"
+
+docs:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "**/README.md"
+ - "**/README_CN.md"
+ - "home/**/*"
+
+home:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "home/src/**/*"
+
+webapp:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "web-app/**/*"
+
+e2e:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "e2e/**/*"
+
+
+backend:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "alerter/**/*"
+ - "collector/**/*"
+ - "common/**/*"
+ - "grafana/**/*"
+ - "manager/**/*"
+ - "push/**/*"
+ - "remoting/**/*"
+ - "warehouse/**/*"
+
+collector:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "collector/**/*"
+
+monitoring-template:
+ - changed-files:
+ - any-glob-to-any-file:
+ - "manager/src/main/resources/define/**/*"
+
+
+# Add 'feature' label to any PR where the head branch name starts with
`feature` or has a `feature` section in the name
+feature:
+ - head-branch: ['^[feature]', 'feature']
+
+bugfix:
+ - head-branch: ['^[bugfix]', 'bugfix']
+
+doc:
+ - head-branch: ['^[doc]', 'doc']
+
+improve:
+ - head-branch: ['^[improve]', 'improve']
+
+refactor:
+ - head-branch: ['^[refactor]', 'refactor']
+
+cleanup:
+ - head-branch: ['^[cleanup]', 'cleanup']
diff --git a/.github/workflows/backend-build-test.yml
b/.github/workflows/backend-build-test.yml
index d433b4da0..229e0ed95 100644
--- a/.github/workflows/backend-build-test.yml
+++ b/.github/workflows/backend-build-test.yml
@@ -39,17 +39,6 @@ on:
- 'material/**'
jobs:
- license-header:
- if: github.repository == 'apache/hertzbeat'
- name: License header
- runs-on: ubuntu-latest
- timeout-minutes: 10
- steps:
- - uses: actions/checkout@v3
- with:
- submodules: true
- - name: Check license header
- uses: apache/skywalking-eyes/header@main
build:
runs-on: ubuntu-latest
steps:
diff --git a/.github/workflows/backend-build-test.yml
b/.github/workflows/license-checker.yml
similarity index 56%
copy from .github/workflows/backend-build-test.yml
copy to .github/workflows/license-checker.yml
index d433b4da0..6af48f966 100644
--- a/.github/workflows/backend-build-test.yml
+++ b/.github/workflows/license-checker.yml
@@ -18,25 +18,13 @@
# This workflow will build a Java project with Maven
# For more information see:
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-name: Backend CI
+name: License Checker
on:
push:
branches: [ master, dev ]
- paths-ignore:
- - '**.md'
- - 'home/**'
- - 'web-app/**'
- - 'script/**'
- - 'material/**'
pull_request:
branches: [ master, dev ]
- paths-ignore:
- - '**.md'
- - 'home/**'
- - 'web-app/**'
- - 'script/**'
- - 'material/**'
jobs:
license-header:
@@ -50,29 +38,3 @@ jobs:
submodules: true
- name: Check license header
uses: apache/skywalking-eyes/header@main
- build:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 17
- uses: actions/setup-java@v1
- with:
- java-version: 17
- - name: Build with Maven
- run: mvn clean -B package --file pom.xml
- - name: Build Image
- env:
- IMAGE_PUSH: false
- IMAGE_LOAD: true
- IMAGE_PLATFORM: linux/amd64
- run: |
- docker buildx create --use --name mybuilder --driver docker-container
- docker buildx use mybuilder
-
- ./script/docker/server/build.sh
- - name: Run E2E
- run: |
- sudo curl -L
https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64
-o /usr/local/bin/docker-compose
- sudo chmod u+x /usr/local/bin/docker-compose
-
- cd e2e && ./start.sh
diff --git a/.github/workflows/pull-request-robot.yml
b/.github/workflows/pull-request-robot.yml
new file mode 100644
index 000000000..0179adf00
--- /dev/null
+++ b/.github/workflows/pull-request-robot.yml
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: "Pull Request Robot"
+on:
+ - pull_request_target
+
+jobs:
+ labeler:
+ permissions:
+ contents: read
+ pull-requests: write
+ runs-on: ubuntu-latest
+ steps:
+ - name: Label pull request
+ uses: actions/labeler@v5
+ with:
+ repo-token: "${{ secrets.GITHUB_TOKEN }}"
+ configuration-path: .github/labeler.yml
+ sync-labels: true
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
