diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
index a2ddfd12..ae010756 100644
--- a/.github/workflows/check-standard.yaml
+++ b/.github/workflows/check-standard.yaml
@@ -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'}
diff --git a/.github/workflows/maven-build-installer-macos.yml b/.github/workflows/maven-build-installer-macos.yml
index 8766e8b1..32ef4708 100644
--- a/.github/workflows/maven-build-installer-macos.yml
+++ b/.github/workflows/maven-build-installer-macos.yml
@@ -14,7 +14,7 @@ on:
jobs:
build:
- runs-on: macos-latest
+ runs-on: macos-12
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/maven-build-installer-macosaarch64.yml b/.github/workflows/maven-build-installer-macosaarch64.yml
new file mode 100644
index 00000000..8792228e
--- /dev/null
+++ b/.github/workflows/maven-build-installer-macosaarch64.yml
@@ -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
diff --git a/RCaNconstructor/macaarch64-javafx/README.txt b/RCaNconstructor/macaarch64-javafx/README.txt
new file mode 100644
index 00000000..8a393c86
--- /dev/null
+++ b/RCaNconstructor/macaarch64-javafx/README.txt
@@ -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.
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod
new file mode 100644
index 00000000..b30c5687
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod
new file mode 100644
index 00000000..828f503e
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod
new file mode 100644
index 00000000..b1edfe9d
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod
new file mode 100644
index 00000000..e3d6288b
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod
new file mode 100644
index 00000000..d47f506e
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod
new file mode 100644
index 00000000..759b8c85
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.base.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.base.jmod
new file mode 100644
index 00000000..81679540
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.base.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.controls.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.controls.jmod
new file mode 100644
index 00000000..a023a7bd
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.controls.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.fxml.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.fxml.jmod
new file mode 100644
index 00000000..7dce42c7
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.fxml.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.graphics.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.graphics.jmod
new file mode 100644
index 00000000..627f29f8
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.graphics.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.media.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.media.jmod
new file mode 100644
index 00000000..295ecab8
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.media.jmod differ
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.swing.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.swing.jmod
new file mode 100644
index 00000000..d61eacbe
Binary files /dev/null and b/RCaNconstructor/macaarch64-javafx/javafx-jmods-22.0.2/javafx.swing.jmod differ
diff --git a/RCaNconstructor/pom.xml b/RCaNconstructor/pom.xml
index 800bcedf..e107df2f 100644
--- a/RCaNconstructor/pom.xml
+++ b/RCaNconstructor/pom.xml
@@ -382,16 +382,29 @@
- mac-active
+ macx64-active
mac
+ x64
mac
+
+ macaarch64-active
+
+
+ mac
+ aarch64
+
+
+
+ macaarch64
+
+