Skip to content

Commit

Permalink
Only build openssl-classes and boringssl-static on windows
Browse files Browse the repository at this point in the history
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
  • Loading branch information
normanmaurer committed Oct 6, 2023
1 parent 62b0a1a commit 36a5865
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
18 changes: 18 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,24 @@
</modules>
</profile>


<profile>
<id>windows-compile-static-only</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<moduleSelector>none</moduleSelector>
</properties>
<modules>
<!-- Ony Windows we only support boringssl-static -->
<module>openssl-classes</module>
<module>boringssl-static</module>
</modules>
</profile>

<!--
Profile for building all modules. This is enabled by default so if any profile is manually specified,
this will be disabled automatically.
Expand Down

0 comments on commit 36a5865

Please sign in to comment.