From 634c660587a9c5e8244a8b59dc7cbbb8b649ca9a Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 27 Aug 2024 09:26:29 +0200 Subject: [PATCH] Fix netty-all artifact snapshot deployments Motivation: We need to ensure we have all the native dependencies thats we need before we re-generate the netty-all jar as otherwise these willl be missing if people depend on it Modifications: - Add extra profile which only add linux native libs - Add some more steps in the workflow to ensure we regenerate the netty-all jar before deploy everything that was locally staged Result: Fix netty-all snapshot build --- .github/workflows/ci-deploy.yml | 11 +++++++++++ all/pom.xml | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index efab4286b29..b416e5c56a8 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -126,6 +126,15 @@ jobs: name: linux-x86_64-java8-local-staging path: ~/linux-x86_64-java8-local-staging + - name: Copy previous build artifacts to local maven repository + run: | + cp -r ~/linux-aarch64-local-staging/deferred/* ~/.m2/repository/ + cp -r ~/linux-riscv64-local-staging/deferred/* ~/.m2/repository/ + cp -r ~/linux-x86_64-java8-local-staging/deferred/* ~/.m2/repository/ + + - name: Generate netty-all and deploy to local staging. + run: ./mvnw -Plinux-native-dependencies -pl all org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DaltStagingDirectory=/root/all-local-staging -DskipRemoteStaging=true -DskipTests=true + - name: Merge staging repositories run: | mkdir -p ~/local-staging/deferred @@ -135,6 +144,8 @@ jobs: cp -r ~/linux-riscv64-local-staging/deferred/* ~/local-staging/deferred/ cat ~/linux-x86_64-java8-local-staging/deferred/.index >> ~/local-staging/deferred/.index cp -r ~/linux-x86_64-java8-local-staging/deferred/* ~/local-staging/deferred/ + cat ~/all-local-staging/deferred/.index >> ~/local-staging/deferred/.index + cp -r ~/all-local-staging/deferred/* ~/local-staging/deferred/ - uses: s4u/maven-settings-action@v3.0.0 with: diff --git a/all/pom.xml b/all/pom.xml index 2eb58814779..1296c950672 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -111,6 +111,32 @@ + + linux-native-dependencies + + + + + + ${project.groupId} + netty-transport-native-epoll + linux-x86_64 + runtime + + + ${project.groupId} + netty-transport-native-epoll + linux-aarch_64 + runtime + + + ${project.groupId} + netty-transport-native-epoll + linux-riscv64 + runtime + + +