From 36a58659287d25faab02a752ccf1b87b2ac5b2ec Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 20 Jun 2023 08:44:28 +0200 Subject: [PATCH 1/2] Only build openssl-classes and boringssl-static on windows Motivation: When on windows we should only try to build openssl-classesand boringssl-static as nothing else is supported atm Modifications: - Add profile for windows which configure the correct modules to use - Adjust workflow for windows to depend on the new profile Result: ./mvn clean package works on windows out of the box --- .github/workflows/ci-build.yml | 2 +- .github/workflows/ci-deploy.yml | 2 +- .github/workflows/ci-pr.yml | 2 +- pom.xml | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index c97525a39..0d5a2b8a9 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -98,7 +98,7 @@ jobs: build-windows-m2-repository-cache- - name: Build netty-tcnative-boringssl-static - run: ./mvnw.cmd --file pom.xml -am -pl boringssl-static clean package + run: ./mvnw.cmd --file pom.xml clean package - uses: actions/upload-artifact@v3 if: ${{ failure() }} diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index bb38a8b5f..167dc6971 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -101,7 +101,7 @@ jobs: stage-snapshot-windows-m2-repository-cache- - name: Build netty-tcnative-boringssl-static - run: ./mvnw.cmd --file pom.xml -am -pl boringssl-static clean package org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DaltStagingDirectory=local-staging -DskipRemoteStaging=true -DskipTests=true + run: ./mvnw.cmd --file pom.xml clean package org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DaltStagingDirectory=local-staging -DskipRemoteStaging=true -DskipTests=true - name: Upload local staging directory uses: actions/upload-artifact@v3 diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 0d12602b8..8b80f6864 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -94,7 +94,7 @@ jobs: build-pr-windows-m2-repository-cache- - name: Build netty-tcnative-boringssl-static - run: ./mvnw.cmd --file pom.xml -am -pl boringssl-static clean package + run: ./mvnw.cmd --file pom.xml clean package - uses: actions/upload-artifact@v3 if: ${{ failure() }} diff --git a/pom.xml b/pom.xml index ad6be0e7a..5c3694bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -788,6 +788,24 @@ + + + windows-compile-static-only + + + windows + + + + none + + + + openssl-classes + boringssl-static + + + - -Prestricted-release,sonatype-oss-release -DmoduleSelector=none + -Prestricted-release,sonatype-oss-release @{project.artifactId}-@{project.version} true @@ -796,9 +795,6 @@ windows - - none - openssl-classes @@ -806,16 +802,28 @@ - - all + linux-compile-all + + + linux + + + + openssl-classes + openssl-dynamic + openssl-static + boringssl-static + libressl-static + + + + + osx-compile-all - - !moduleSelector - + + osx + openssl-classes