This is an automated email from the ASF dual-hosted git repository.
zhangxiaowei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 9c4b83c5 fix: update and test pr commit check process (#451)
9c4b83c5 is described below
commit 9c4b83c56e181c59418cad761dff8955b29fedba
Author: gaoxh <[email protected]>
AuthorDate: Mon Sep 9 15:10:04 2024 +0800
fix: update and test pr commit check process (#451)
Co-authored-by: gaoxihui <[email protected]>
---
.github/workflows/ozhera-app-package.yml | 7 +++++--
.github/workflows/ozhera-demo-client-package.yml | 7 +++++--
.github/workflows/ozhera-demo-server-package.yml | 7 +++++--
.github/workflows/ozhera-intelligence-package.yml | 7 +++++--
.github/workflows/ozhera-log-package.yml | 7 +++++--
.github/workflows/ozhera-monitor-package.yml | 7 +++++--
.github/workflows/ozhera-operator-package.yml | 7 +++++--
.github/workflows/ozhera-prometheus-agent-package.yml | 7 +++++--
.github/workflows/ozhera-tspandata-package.yml | 7 +++++--
.github/workflows/ozhera-webhook-package.yml | 7 +++++--
.github/workflows/prometheus-starter-all-package.yml | 7 +++++--
.github/workflows/trace-etl-package.yml | 7 +++++--
.../src/main/java/com/xiaomi/mone/monitor/service/impl/ABImpl.java | 1 -
13 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/ozhera-app-package.yml
b/.github/workflows/ozhera-app-package.yml
index 6a9b4b53..999c9daf 100644
--- a/.github/workflows/ozhera-app-package.yml
+++ b/.github/workflows/ozhera-app-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-app test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-demo-client-package.yml
b/.github/workflows/ozhera-demo-client-package.yml
index 1c9b4b4e..f395b8ff 100644
--- a/.github/workflows/ozhera-demo-client-package.yml
+++ b/.github/workflows/ozhera-demo-client-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-demo-client test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-demo-server-package.yml
b/.github/workflows/ozhera-demo-server-package.yml
index 71c3c062..6c577c32 100644
--- a/.github/workflows/ozhera-demo-server-package.yml
+++ b/.github/workflows/ozhera-demo-server-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-demo-server test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-intelligence-package.yml
b/.github/workflows/ozhera-intelligence-package.yml
index 2a614a42..ff94be32 100644
--- a/.github/workflows/ozhera-intelligence-package.yml
+++ b/.github/workflows/ozhera-intelligence-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-intelligence test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-log-package.yml
b/.github/workflows/ozhera-log-package.yml
index 683ace01..6d3bd901 100644
--- a/.github/workflows/ozhera-log-package.yml
+++ b/.github/workflows/ozhera-log-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-log test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-monitor-package.yml
b/.github/workflows/ozhera-monitor-package.yml
index 055176a7..a9b4eb59 100644
--- a/.github/workflows/ozhera-monitor-package.yml
+++ b/.github/workflows/ozhera-monitor-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-monitor test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-operator-package.yml
b/.github/workflows/ozhera-operator-package.yml
index 385e400a..75f1c61c 100644
--- a/.github/workflows/ozhera-operator-package.yml
+++ b/.github/workflows/ozhera-operator-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-operator test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-prometheus-agent-package.yml
b/.github/workflows/ozhera-prometheus-agent-package.yml
index a6412105..a06f31e0 100644
--- a/.github/workflows/ozhera-prometheus-agent-package.yml
+++ b/.github/workflows/ozhera-prometheus-agent-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-prometheus-agent test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-tspandata-package.yml
b/.github/workflows/ozhera-tspandata-package.yml
index e88c5f70..edca0b47 100644
--- a/.github/workflows/ozhera-tspandata-package.yml
+++ b/.github/workflows/ozhera-tspandata-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-tspandata test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/ozhera-webhook-package.yml
b/.github/workflows/ozhera-webhook-package.yml
index af7eb4a5..a2f3db3f 100644
--- a/.github/workflows/ozhera-webhook-package.yml
+++ b/.github/workflows/ozhera-webhook-package.yml
@@ -16,10 +16,13 @@ jobs:
name: ozhera-webhook test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/prometheus-starter-all-package.yml
b/.github/workflows/prometheus-starter-all-package.yml
index e178de5e..1f063615 100644
--- a/.github/workflows/prometheus-starter-all-package.yml
+++ b/.github/workflows/prometheus-starter-all-package.yml
@@ -16,10 +16,13 @@ jobs:
name: prometheus-starter-all test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git a/.github/workflows/trace-etl-package.yml
b/.github/workflows/trace-etl-package.yml
index a7116cf8..c882a6b8 100644
--- a/.github/workflows/trace-etl-package.yml
+++ b/.github/workflows/trace-etl-package.yml
@@ -16,10 +16,13 @@ jobs:
name: trace-etl test
runs-on: ubuntu-latest
steps:
- - name: Setup Maven Action
- uses: s4u/[email protected]
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
with:
java-version: 21
+ distribution: 'zulu'
+ cache: maven
#settings-properties: '[{"propertyName1": "propertyValue1"},
{"propertyName2": "propertyValue2"}]'
- run: echo '<settings> <interactiveMode>false</interactiveMode>
<profiles> <profile> <repositories>
<repository> <snapshots /> <id>ossrh</id>
<name>ossrh-snapshot</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</repository> </repositories> <pluginRepositories>
<pluginRepository> [...]
diff --git
a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/ABImpl.java
b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/ABImpl.java
index 1045e548..c815e233 100644
---
a/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/ABImpl.java
+++
b/ozhera-monitor/ozhera-monitor-service/src/main/java/com/xiaomi/mone/monitor/service/impl/ABImpl.java
@@ -30,7 +30,6 @@ import java.util.Map;
public class ABImpl implements AB {
@Override
public void testA() {
- //TODO
log.info("=================Dubbo 服务 AB被调用=================");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
