Made mac signing generalize for version

CI-CMG · Oct 29, 2024 · e8bb4d7 · e8bb4d7
1 parent 4b14443
commit e8bb4d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
@@ -94,7 +94,7 @@ jobs:
           INSTALL_CERT_PASSWORD: ${{ secrets.CP_APPLE_INSTALL_CERT_PASSWORD }}
 
       - name: Specialized signing
-        run: bash ./mac-signing.sh "$MY_KEYCHAIN" "$MAC_SIGNING_KEY_USER_NAME"
+        run: bash ./mac-signing.sh "$MY_KEYCHAIN" "./jars/pace-cli-${{ needs.build.outputs.version }}.jar"
         env:
           MY_KEYCHAIN: sign-keychain
           MAC_SIGNING_KEY_USER_NAME: ${{ secrets.MAC_SIGNING_KEY_USER_NAME }}
@@ -187,7 +187,7 @@ jobs:
           INSTALL_CERT_PASSWORD: ${{ secrets.CP_APPLE_INSTALL_CERT_PASSWORD }}
 
       - name: Specialized signing
-        run: bash ./mac-signing-gui.sh "$MY_KEYCHAIN" "$MAC_SIGNING_KEY_USER_NAME"
+        run: bash ./mac-signing-gui.sh "$MY_KEYCHAIN" "./jars/pace-gui-${{ needs.build.outputs.version }}.jar"
         env:
           MY_KEYCHAIN: sign-keychain
           MAC_SIGNING_KEY_USER_NAME: ${{ secrets.MAC_SIGNING_KEY_USER_NAME }}

diff --git a/build-resources/mac-signing-gui.sh b/build-resources/mac-signing-gui.sh
@@ -3,13 +3,13 @@ set -ex
 ls jars
 
 echo Extracting gui dylib files
-jar -xf ./jars/pace-gui-0.1.1-SNAPSHOT.jar com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib
-jar -xf ./jars/pace-gui-0.1.1-SNAPSHOT.jar com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib
+jar -xf $2 com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib
+jar -xf $2 com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib
 
 echo Signing gui dylib files
 /usr/bin/codesign -s 'Developer ID Application: University of Colorado Boulder (8JR6566HZ6)' -vvvv --timestamp --options runtime --prefix 'edu.colorado.cires.pace.gui.' --keychain "$1" --force com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib
 /usr/bin/codesign -s 'Developer ID Application: University of Colorado Boulder (8JR6566HZ6)' -vvvv --timestamp --options runtime --prefix 'edu.colorado.cires.pace.gui.' --keychain "$1" --force com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib
 
 echo Repacking gui dylib files
-jar -uf ./jars/pace-gui-0.1.1-SNAPSHOT.jar com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib
-jar -uf ./jars/pace-gui-0.1.1-SNAPSHOT.jar com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib
+jar -uf $2 com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib
+jar -uf $2 com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib
diff --git a/build-resources/mac-signing.sh b/build-resources/mac-signing.sh
@@ -1,13 +1,13 @@
 set -ex
 
 echo Extracting cli dylib files
-jar -xf ./jars/pace-cli-0.1.1-SNAPSHOT.jar org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib
-jar -xf ./jars/pace-cli-0.1.1-SNAPSHOT.jar org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib
+jar -xf $2 org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib
+jar -xf $2 org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib
 
 echo Signing cli dylib files
 /usr/bin/codesign -s 'Developer ID Application: University of Colorado Boulder (8JR6566HZ6)' -vvvv --timestamp --options runtime --prefix 'edu.colorado.cires.pace.cli.' --keychain "$1" --force org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib
 /usr/bin/codesign -s 'Developer ID Application: University of Colorado Boulder (8JR6566HZ6)' -vvvv --timestamp --options runtime --prefix 'edu.colorado.cires.pace.cli.' --keychain "$1" --force org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib
 
 echo Repacking cli dylib files
-jar -uf ./jars/pace-cli-0.1.1-SNAPSHOT.jar org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib
-jar -uf ./jars/pace-cli-0.1.1-SNAPSHOT.jar org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib
+jar -uf $2 org/sqlite/native/Mac/aarch64/libsqlitejdbc.dylib
+jar -uf $2 org/sqlite/native/Mac/x86_64/libsqlitejdbc.dylib