Merge pull request #9550 from Alexey-Rivkin/topic/jucx_arm-v1.16.x

AZP: Fix JUCX with ARM build-v1.16.x

Author: yosefe

bindings/java/src/main/native/Makefile.am

@@ -103,22 +103,30 @@ set-version:
 repack-jar: $(jarfile)
 	$(RM) -r $(java_build_dir)/repack_dir
 	unzip -o $(jarfile) -d $(java_build_dir)/repack_dir
-	\cp $(topdir)/libjucx_*.so/libjucx_*.so $(java_build_dir)/repack_dir
+	\cp -v $(topdir)/libjucx_*.so/libjucx_*.so $(topdir)/bindings/java/resources
+	\cp -v $(topdir)/libjucx_*.so/libjucx_*.so $(java_build_dir)/repack_dir
 	jar -cf $(jarfile) -C $(java_build_dir)/repack_dir .
 	jar tf $(jarfile)
 
 multi-arch:
 	@make set-version JUCX_VERSION=${JUCX_VERSION}
 	@make repack-jar
 
+check-jar:
+	@test $(shell jar tf $(jarfile) | grep -q libjucx_amd64.so)
+	@test $(shell jar tf $(jarfile) | grep -q libjucx_aarch64.so)
+
 # Publish JUCX jar to maven central
 publish-snapshot:
 	@make set-version JUCX_VERSION=@VERSION@-SNAPSHOT
+	@make repack-jar
+	@make check-jar
 	@make publish
 
 publish-release:
 	@make set-version JUCX_VERSION=${JUCX_VERSION}
 	@make repack-jar
+	@make check-jar
 	@make publish
 
 publish:

buildlib/jucx/jucx-publish.yml

@@ -40,6 +40,7 @@ jobs:
         displayName: Build ucx
 
       - bash: |
+          set -exE
           source buildlib/az-helpers.sh
           az_init_modules
           az_module_load dev/mvn
@@ -77,6 +78,7 @@ jobs:
         name: publicKey
 
       - bash: |
+          set -exE
           source buildlib/az-helpers.sh
           az_init_modules
           az_module_load dev/mvn