From 1cb6908a573a8948369c9eb0a52fa62c7ae63de3 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Mon, 1 Jul 2024 07:27:49 +0200
Subject: [PATCH] RATIS-2118. Improve assembly process (#1117)
---
.github/workflows/post-commit.yml | 10 +--
dev-support/make_rc.sh | 6 +-
ratis-assembly/pom.xml | 9 ---
ratis-assembly/src/main/assembly/bin-pkg.xml | 43 -----------
ratis-assembly/src/main/assembly/bin.xml | 57 ++++++++++++++-
.../src/main/assembly/examples-bin.xml | 73 -------------------
.../src/main/assembly/shell-bin.xml | 61 ----------------
ratis-assembly/src/main/assembly/src.xml | 1 +
8 files changed, 65 insertions(+), 195 deletions(-)
delete mode 100644 ratis-assembly/src/main/assembly/bin-pkg.xml
delete mode 100644 ratis-assembly/src/main/assembly/examples-bin.xml
delete mode 100644 ratis-assembly/src/main/assembly/shell-bin.xml
diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml
index 2aafb90316..4a09057544 100644
--- a/.github/workflows/post-commit.yml
+++ b/.github/workflows/post-commit.yml
@@ -50,14 +50,14 @@ jobs:
with:
name: ratis-bin
path: |
- ratis-assembly/target/apache-ratis-*.tar.gz
- !ratis-assembly/target/apache-ratis-*-src.tar.gz
+ ratis-assembly/target/ratis-assembly-*.tar.gz
+ !ratis-assembly/target/ratis-assembly-*-src.tar.gz
retention-days: 1
- name: Store source tarball for compilation
uses: actions/upload-artifact@v4
with:
name: ratis-src
- path: ratis-assembly/target/apache-ratis-*-src.tar.gz
+ path: ratis-assembly/target/ratis-assembly-*-src.tar.gz
retention-days: 1
compile:
needs:
@@ -75,7 +75,7 @@ jobs:
name: ratis-src
- name: Untar sources
run: |
- tar --strip-components 1 -xzvf apache-ratis-*-src.tar.gz
+ tar --strip-components 1 -xzvf ratis-assembly-*-src.tar.gz
- name: Cache for maven dependencies
uses: actions/cache/restore@v4
with:
@@ -256,7 +256,7 @@ jobs:
- name: Untar binaries
run: |
mkdir -p ratis-assembly/target
- tar xzvf target/artifacts/ratis-bin/apache-ratis*.tar.gz -C ratis-assembly/target
+ tar xzvf target/artifacts/ratis-bin/ratis-assembly-*.tar.gz -C ratis-assembly/target
- name: Calculate combined coverage
run: ./dev-support/checks/coverage.sh
- name: Upload coverage to Sonar
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 6394d1427b..64a6d3d413 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -114,7 +114,7 @@ prepare-bin() {
rm -rf "$WORKINGDIR"
mkdir -p "$WORKINGDIR"
cd "$WORKINGDIR"
- tar zvxf "$projectdir/ratis-assembly/target/apache-ratis-${RATISVERSION}-src.tar.gz"
+ tar zvxf "$projectdir/ratis-assembly/target/ratis-assembly-${RATISVERSION}-src.tar.gz"
mv "apache-ratis-${RATISVERSION}-src" "apache-ratis-${RATISVERSION}"
cd "apache-ratis-${RATISVERSION}"
@@ -126,8 +126,8 @@ assembly() {
RCDIR="$SVNDISTDIR/${RATISVERSION}/${RC#-}"
mkdir -p "$RCDIR"
cd "$RCDIR"
- cp "$WORKINGDIR/apache-ratis-${RATISVERSION}/ratis-assembly/target/apache-ratis-${RATISVERSION}-bin.tar.gz" "apache-ratis-${RATISVERSION}-bin.tar.gz"
- cp "$projectdir/ratis-assembly/target/apache-ratis-${RATISVERSION}-src.tar.gz" "apache-ratis-${RATISVERSION}-src.tar.gz"
+ cp "$WORKINGDIR/apache-ratis-${RATISVERSION}/ratis-assembly/target/ratis-assembly-${RATISVERSION}-bin.tar.gz" "apache-ratis-${RATISVERSION}-bin.tar.gz"
+ cp "$projectdir/ratis-assembly/target/ratis-assembly-${RATISVERSION}-src.tar.gz" "apache-ratis-${RATISVERSION}-src.tar.gz"
for i in *.tar.gz; do gpg -u "${CODESIGNINGKEY}" --armor --output "${i}.asc" --detach-sig "${i}"; done
for i in *.tar.gz; do gpg --print-md SHA512 "${i}" > "${i}.sha512"; done
for i in *.tar.gz; do gpg --print-mds "${i}" > "${i}.mds"; done
diff --git a/ratis-assembly/pom.xml b/ratis-assembly/pom.xml
index 3a2aa9154a..1492f82b14 100644
--- a/ratis-assembly/pom.xml
+++ b/ratis-assembly/pom.xml
@@ -120,8 +120,6 @@
org.apache.maven.plugins
maven-assembly-plugin
-
- apache-ratis-${project.version}
false
true
gnu
@@ -137,8 +135,6 @@
src/main/assembly/src.xml
- apache-ratis-${project.version}-src
- false
@@ -149,13 +145,8 @@
- src/main/assembly/examples-bin.xml
- src/main/assembly/shell-bin.xml
src/main/assembly/bin.xml
- src/main/assembly/bin-pkg.xml
- apache-ratis-${project.version}-bin
- false
diff --git a/ratis-assembly/src/main/assembly/bin-pkg.xml b/ratis-assembly/src/main/assembly/bin-pkg.xml
deleted file mode 100644
index 4d89869578..0000000000
--- a/ratis-assembly/src/main/assembly/bin-pkg.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- bin-pkg
-
- tar.gz
-
-
-
- ${project.basedir}/target/apache-ratis-${project.version}-bin/apache-ratis-${project.version}-bin
- ..
-
- bin/ratis
- libexec/*.sh
- examples/bin/*.sh
-
-
-
- ${project.basedir}/target/apache-ratis-${project.version}-bin/apache-ratis-${project.version}-bin
- ..
-
- bin/ratis
- libexec/*.sh
- examples/bin/*.sh
-
- 0755
-
-
-
diff --git a/ratis-assembly/src/main/assembly/bin.xml b/ratis-assembly/src/main/assembly/bin.xml
index abf4d40aa8..7fd3cc0df5 100644
--- a/ratis-assembly/src/main/assembly/bin.xml
+++ b/ratis-assembly/src/main/assembly/bin.xml
@@ -22,9 +22,18 @@
*/
-->
bin
+ apache-ratis-${project.version}-bin
- dir
+ tar.gz
+
+
+
+ org.apache.ratis:ratis-examples
+
+ examples/lib
+
+
true
@@ -42,6 +51,7 @@
org.apache.ratis:ratis-metrics-api
org.apache.ratis:ratis-metrics-default
org.apache.ratis:ratis-metrics-dropwizard3
+ org.apache.ratis:ratis-shell
org.apache.ratis:ratis-tools
org.apache.ratis:ratis-resource-bundle
@@ -80,5 +90,50 @@
0644
0755
+
+ ${project.basedir}/../ratis-shell/src/main/bin
+ bin
+ 0755
+
+
+ ${project.basedir}/../ratis-shell/src/main/libexec
+ libexec
+ 0755
+ 0755
+
+
+ ${project.basedir}/../ratis-shell/src/main/conf
+ conf
+ 644
+
+
+ ${project.basedir}/../ratis-shell/target/lib/
+ jars
+
+
+ ${project.basedir}/../ratis-examples
+ examples
+
+ README.md
+
+ 0644
+
+
+ ${project.basedir}/../ratis-examples/src/main/bin
+ examples/bin
+
+ *.*
+
+ 0755
+
+
+ ${project.basedir}/../ratis-examples/src/main/resources
+ examples/conf
+
+ conf.properties
+ log4j.properties
+
+ 644
+
diff --git a/ratis-assembly/src/main/assembly/examples-bin.xml b/ratis-assembly/src/main/assembly/examples-bin.xml
deleted file mode 100644
index 21cc7eced2..0000000000
--- a/ratis-assembly/src/main/assembly/examples-bin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- examples-bin
-
- dir
-
-
-
-
- org.apache.ratis:ratis-examples
-
- examples/lib
-
-
-
-
- ${project.basedir}/src/main/resources
- .
-
- README.md
- LICENSE
- NOTICE
-
- 0644
-
-
- ${project.basedir}/../ratis-examples
- examples
-
- README.md
-
- 0644
-
-
- ${project.basedir}/../ratis-examples/src/main/bin
- examples/bin
-
- *.*
-
- 0755
-
-
- ${project.basedir}/../ratis-examples/src/main/resources
- examples/conf
-
- conf.properties
- log4j.properties
-
- 644
-
-
-
diff --git a/ratis-assembly/src/main/assembly/shell-bin.xml b/ratis-assembly/src/main/assembly/shell-bin.xml
deleted file mode 100644
index 470870f41c..0000000000
--- a/ratis-assembly/src/main/assembly/shell-bin.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
- shell
-
- dir
-
-
-
- ${project.basedir}/../ratis-shell/target/
- jars
-
- ratis-shell-${project.version}.jar
-
-
-
- ${project.basedir}/../ratis-shell/target/lib/
- jars
-
-
- ${project.basedir}/src/main/resources
- .
-
- README.md
- LICENSE
- NOTICE
-
- 0644
-
-
- ${project.basedir}/../ratis-shell/src/main/bin
- bin
- 0755
-
-
- ${project.basedir}/../ratis-shell/src/main/libexec
- libexec
- 0755
- 0755
-
-
- ${project.basedir}/../ratis-shell/src/main/conf
- conf
- 644
-
-
-
diff --git a/ratis-assembly/src/main/assembly/src.xml b/ratis-assembly/src/main/assembly/src.xml
index 98e06c5739..8c025c9c66 100644
--- a/ratis-assembly/src/main/assembly/src.xml
+++ b/ratis-assembly/src/main/assembly/src.xml
@@ -22,6 +22,7 @@
*/
-->
src
+ apache-ratis-${project.version}-src
tar.gz