@@ -840,16 +840,21 @@ jobs:
840840 path : release-bundle
841841 - name : Merge all build artifacts into one directory
842842 run : |
843- mkdir -p release-bundle/merged
844- cp -rn release-bundle/Linux-Aarch64-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
845- cp -rn release-bundle/Linux-ArmV7-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
846- cp -rn release-bundle/Linux-ppc64le-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
847- cp -rn release-bundle/Linux-riscv64-Build-JDK11/Brotli4j/* release-bundle/merged/ || true
848- cp -rn release-bundle/Linux-s390x-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
849- cp -rn release-bundle/Linux-x86_64-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
850- cp -rn release-bundle/MacOS-x86_64-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
851- cp -rn release-bundle/Windows-ARM-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
852- cp -rn release-bundle/Windows-x86_64-Build-JDK8/Brotli4j/* release-bundle/merged/ || true
843+ mv release-bundle/Linux-x86_64-Build-JDK8/Brotli4j/natives/linux-x86_64/target/ natives/linux-x86_64/target
844+ mv release-bundle/Linux-Aarch64-Build-JDK8/Brotli4j/natives/linux-aarch64/target/ natives/linux-aarch64/target
845+ mv release-bundle/Linux-ArmV7-Build-JDK8/Brotli4j/natives/linux-armv7/target/ natives/linux-armv7/target
846+ mv release-bundle/Linux-ppc64le-Build-JDK8/Brotli4j/natives/linux-ppc64le/target/ natives/linux-ppc64le/target
847+ mv release-bundle/Linux-riscv64-Build-JDK11/Brotli4j/natives/linux-riscv64/target/ natives/linux-riscv64/target
848+ mv release-bundle/Linux-s390x-Build-JDK8/Brotli4j/natives/linux-s390x/target/ natives/linux-s390x/target
849+ mv release-bundle/Windows-ARM-Build-JDK8/Brotli4j/natives/windows-aarch64/target/ natives/windows-aarch64/target
850+ mv release-bundle/Windows-x86_64-Build-JDK8/Brotli4j/natives/windows-x86_64/target/ natives/windows-x86_64/target
851+
852+ # Both MacOS builds are done on x86_64 using cross-compilation, so we need to copy both.
853+ mkdir natives/osx-x86_64/target
854+ cp -r release-bundle/MacOS-x86_64-Build-JDK8/Brotli4j/natives/osx-x86_64/target/ natives/osx-x86_64/target
855+
856+ mkdir natives/osx-aarch64/target
857+ cp -r release-bundle/MacOS-x86_64-Build-JDK8/Brotli4j/natives/osx-aarch64/target/ natives/osx-aarch64/target
853858 - name : Set up JDK 8 for deploy
854859 uses : actions/setup-java@v4
855860 with :
@@ -874,5 +879,4 @@ jobs:
874879 passphrase : ${{ secrets.GPG_PASSPHRASE }}
875880 - name : Deploy to Maven Central
876881 run : |
877- cd release-bundle/merged
878- mvn deploy -ntp -B -Dmaven.main.skip -DskipTests -Dexec.skip
882+ mvn deploy -ntp -B -DskipTests -Dexec.skip
0 commit comments