Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-…

…crypto.git
apache · Nov 29, 2023 · 1d2759b · 1d2759b
2 parents 63876b3 + 0826852
commit 1d2759b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/maven_crosstest.yml b/.github/workflows/maven_crosstest.yml
@@ -51,9 +51,11 @@ jobs:
       - name: Image prefix (lower case)
         run: |
           echo "IMAGE_PREFIX=$(echo ${{ env.REGISTRY }}/${{ github.repository }} | tr '[A-Z]' '[a-z]')" >>$GITHUB_ENV
-      - name: Build package
+      - name: Build 64 bit native code
         run: |
           time IMAGE_PREFIX=${IMAGE_PREFIX} docker compose -f src/docker/docker-compose-gh.yaml run --quiet-pull crypto-gh src/docker/build.sh
+      - name: Build 32 bit native code
+        run: |
           time IMAGE_PREFIX=${IMAGE_PREFIX} docker compose -f src/docker/docker-compose-gh.yaml run --quiet-pull crypto-gh src/docker/build_linux32.sh
           ls -l target
       - name: Run on aarch64

diff --git a/build_dist.sh b/build_dist.sh
@@ -18,7 +18,7 @@ set -ex
 mvn clean
 
 # build linux 64 bit libraries
-docker compose -f src/docker/docker-compose.yaml run crypto src/docker/build.sh
+docker compose -f src/docker/docker-compose.yaml run --quiet-pull crypto src/docker/build.sh
 
 # build linux 32 bit libraries
 docker compose -f src/docker/docker-compose.yaml run crypto src/docker/build_linux32.sh

diff --git a/src/docker/build.sh b/src/docker/build.sh
@@ -29,8 +29,8 @@ cp /usr/include/x86_64-linux-gnu/openssl/opensslconf.h /usr/include/openssl
 MAVEN_ARGS="-V -B -ntp -Drat.skip -Djacoco.skip -DbuildNumber.skip -Danimal.sniffer.skip -Dcyclonedx.skip -Dspdx.skip"
 # requires Maven 3.9.0+ to be automatically read
 
-# Run the 64-bit builds.
-mvn clean package ${MAVEN_ARGS}
+# Run the 64-bit builds (no test)
+mvn clean test -DskipTests ${MAVEN_ARGS}
 
 # use process-classes rather than package to speed up builds
 mvn process-classes -Dtarget.name=linux-aarch64 ${MAVEN_ARGS}

diff --git a/src/docker/build_linux32.sh b/src/docker/build_linux32.sh
@@ -34,7 +34,7 @@ time apt-get --assume-yes -qq install g++-multilib >/dev/null
 MAVEN_ARGS="-V -B -ntp -Drat.skip -Djacoco.skip -DbuildNumber.skip -Danimal.sniffer.skip -Dcyclonedx.skip -Dspdx.skip"
 # requires Maven 3.9.0+ to be automatically read
 
-mvn -DskipTests package -Dtarget.name=linux32 ${MAVEN_ARGS}
+mvn process-classes -Dtarget.name=linux32 ${MAVEN_ARGS}
 
 # Show generated files
 find target/classes/org/apache/commons/crypto/native -type f -ls