Update workfloews with vars (#192)

HDFGroup · May 15, 2024 · f7b6d0d · f7b6d0d
1 parent a4c63f3
commit f7b6d0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -362,13 +362,13 @@ jobs:
           # import certificate from secrets
           echo $BUILD_CERTIFICATE_BASE64 | base64 --decode > $CERTIFICATE_PATH
           security -v create-keychain -p $KEYCHAIN_PASSWD $KEYCHAIN_PATH
+          security -v list-keychain -d user -s app-signing
           security -v list-keychains
           security -v set-keychain-settings -lut 21600 $KEYCHAIN_PATH
           security -v unlock-keychain -p $KEYCHAIN_PASSWD $KEYCHAIN_PATH
           # import certificate to keychain
           security -v import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security -v set-key-partition-list -S apple-tool:,apple: -k $KEYCHAIN_PASSWD $KEYCHAIN_PATH
-          security -v list-keychain -d user -s $KEYCHAIN_PATH
 
     - name: Set up JDK 21
       uses: actions/setup-java@v3
@@ -469,7 +469,10 @@ jobs:
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
         KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
         KEYCHAIN_NAME: app-signing
-      run: ant -Dsign_state=NOSIGN -noinput -buildfile build.xml binaryPackage
+        SIGNER: ${{ vars.SIGNER }}
+        NOTARY_USER: ${{ vars.NOTARY_USER }}
+        NOTARY_KEY: ${{ vars.NOTARY_KEY }}
+      run: ant -noinput -buildfile build.xml binaryPackage
 
     - name: Rename snapshot binary base name
       id: ren-basename

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,6 +59,10 @@ jobs:
       file_base: ${{ needs.create-files-ant.outputs.file_base }}
       snap_name: hdfview-${{ needs.call-workflow-tarball.outputs.source_base }}
       use_environ: release
+    secrets:      
+      APPLE_CERTS_BASE64: ${{ secrets.APPLE_CERTS_BASE64 }}
+      APPLE_CERTS_BASE64_PASSWD: ${{ secrets.APPLE_CERTS_BASE64_PASSWD }}
+      KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
 
   call-workflow-release:
     needs: [log-the-inputs, call-workflow-tarball, call-workflow-ant]