You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/01/02 08:50:13 UTC
[shardingsphere] branch master updated: refactor agent distribution (#14480)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a2ffe0e refactor agent distribution (#14480)
a2ffe0e is described below
commit a2ffe0e92a3809095563cf508667cd712818007e
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Sun Jan 2 16:49:29 2022 +0800
refactor agent distribution (#14480)
* refactor agent distribution
* refactor agent distribution
Co-authored-by: menghaoran <me...@apache.org>
---
.github/workflows/it.yml | 2 +-
.../main/assembly/shardingsphere-agent-binary-distribution.xml | 10 +++++-----
.../assembly/shardingsphere-proxy-agent-jaeger-assembly.xml | 2 +-
.../shardingsphere-proxy-agent-opentelemetry-assembly.xml | 2 +-
.../assembly/shardingsphere-proxy-agent-zipkin-assembly.xml | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index e33ef85..af42425 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -108,6 +108,6 @@ jobs:
with:
java-version: 8
- name: Build Project
- run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Djacoco.skip=true -DskipITs -DskipTests -Prelease
+ run: ./mvnw -B clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Djacoco.skip=true -DskipITs -DskipTests
- name: Run Integration Test
run: ./mvnw -B clean install -f shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/pom.xml -Pit.env.opentelemetry
diff --git a/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml b/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
index d86c661..151d894 100644
--- a/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
+++ b/shardingsphere-agent/shardingsphere-agent-distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
@@ -20,10 +20,10 @@
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>shardingsphere-agent-bin</id>
<formats>
- <format>dir</format>
<format>tar.gz</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-shardingsphere-agent-bin</baseDirectory>
<fileSets>
<fileSet>
@@ -41,7 +41,7 @@
</fileSet>
<fileSet>
- <directory>${project.basedir}/../shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/target/plugins</directory>
+ <directory>../shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
@@ -49,14 +49,14 @@
</fileSet>
<fileSet>
- <directory>${project.basedir}/../shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
+ <directory>../shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/target/plugins</directory>
+ <directory>../shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
index b46dde2..9f7d386 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-jaeger/src/test/assembly/shardingsphere-proxy-agent-jaeger-assembly.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
- <directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/plugins</directory>
+ <directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-jaeger/target</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-jaeger-*.jar</include>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
index 4a414ff..145250f 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
- <directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/plugins</directory>
+ <directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-opentelemetry-*.jar</include>
diff --git a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
index fe91026..20086a1 100644
--- a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
+++ b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-zipkin/src/test/assembly/shardingsphere-proxy-agent-zipkin-assembly.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
- <directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-distribution/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/plugins</directory>
+ <directory>${project.basedir}/../../../../shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>shardingsphere-agent-tracing-zipkin-*.jar</include>