Skip to content

Commit

Permalink
Update build.uml and fxthemes pom so that only 1 jar is built and eve…
Browse files Browse the repository at this point in the history
…rything is built on a Mac
  • Loading branch information
dukke committed Apr 29, 2024
1 parent d0e6b6d commit 6fe289a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 73 deletions.
34 changes: 1 addition & 33 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,4 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: FXThemes-mac-m1
path: FXThemes/staging

build-windows:
runs-on: windows-latest # windows
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'zulu'

server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Build and Deploy with Maven
run: mvn --batch-mode --update-snapshots clean deploy -pl FXThemes
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

- run: mkdir FXThemes/staging && cp FXThemes/target/*.jar FXThemes/staging
- uses: actions/upload-artifact@v4
with:
name: FXThemes-windows
path: FXThemes/staging


path: FXThemes/staging
40 changes: 0 additions & 40 deletions FXThemes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
</activation>
<properties>
<xcodeScheme>Debug</xcodeScheme>
<fxthemes.platform>mac</fxthemes.platform>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -65,21 +64,6 @@
</plugins>
</build>
</profile>

<!-- *****************************************************************************************-->
<!-- Windows -->
<!-- *****************************************************************************************-->
<profile>
<id>windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<fxthemes.platform>win</fxthemes.platform>
</properties>
</profile>
</profiles>

<properties>
Expand Down Expand Up @@ -156,16 +140,6 @@
</configuration>
</plugin>

<!-- Jar plugin - output Jar configuration -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<classifier>${fxthemes.platform}</classifier>
</configuration>
</plugin>

<!-- display active profile in compile phase -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -181,20 +155,6 @@
</execution>
</executions>
</plugin>

<!-- Install plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>

<!-- Deploy plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit 6fe289a

Please sign in to comment.