Skip to content

Commit

Permalink
try with two mac architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
elfunesto committed Aug 21, 2024
1 parent 07da35a commit 74c5b5d
Show file tree
Hide file tree
Showing 17 changed files with 83 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macos-12, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-build-installer-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build:

runs-on: macos-latest
runs-on: macos-12

steps:
- uses: actions/checkout@v3
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/maven-build-installer-macosaarch64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Build macOS Installer

on:
workflow_dispatch:
branches: [ master ]
push:
branches: [ master ]
paths:
- RCaNconstructor/**

jobs:
build:

runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
java-version: 21.0.3
distribution: 'temurin'
cache: 'maven'

- name: Import signing certificate into keychain
run: |
KEYCHAIN_FILE=default.keychain
KEYCHAIN_PASSWORD=myvoiceismypassport
security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
security default-keychain -s $KEYCHAIN_FILE
security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
security import <(echo $SIGNING_CERTIFICATE_P12_DATA | base64 --decode) \
-f pkcs12 \
-k $KEYCHAIN_FILE \
-P $SIGNING_CERTIFICATE_PASSWORD \
-T /usr/bin/codesign
security set-key-partition-list -S apple-tool:,apple: -s -k $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
env:
SIGNING_CERTIFICATE_P12_DATA: ${{ secrets.SIGNING_CERTIFICATE_P12_DATA }}
SIGNING_CERTIFICATE_PASSWORD: ${{ secrets.SIGNING_CERTIFICATE_PASSWORD }}


- name: Build with Maven
run: mvn -B clean install --file RCaNconstructor/pom.xml
- name: Update Automatic Release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: "${{ secrets.GITHUB_TOKEN}}"
automatic_release_tag: "macOSaarch64-latest"
prerelease: true
title: "macOS Development Build"
files: ./RCaNconstructor/target/*.dmg
12 changes: 12 additions & 0 deletions RCaNconstructor/macaarch64-javafx/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

These files are the same as those available from:

https://gluonhq.com/products/javafx/

...included here to make it easier to just clone off this repository and immediately
run the project.

Please note that the JavaFX web libraries - the embedded WebKit browser components,
are NOT included due to GitHub template size restrictions. You can download those
from the link above and drop them into your own GitHub repo and they should work
fine.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 14 additions & 1 deletion RCaNconstructor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -382,16 +382,29 @@
</build>
</profile>
<profile>
<id>mac-active</id>
<id>macx64-active</id>
<activation>
<os>
<family>mac</family>
<arch>x64</arch>
</os>
</activation>
<properties>
<platform>mac</platform>
</properties>
</profile>
<profile>
<id>macaarch64-active</id>
<activation>
<os>
<family>mac</family>
<arch>aarch64</arch>
</os>
</activation>
<properties>
<platform>macaarch64</platform>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 74c5b5d

Please sign in to comment.