Add check for signing capability

HDFGroup · Aug 13, 2024 · c3c2e6c · c3c2e6c
1 parent 347085c
commit c3c2e6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/ant-app.yml b/.github/workflows/ant-app.yml
@@ -220,6 +220,7 @@ jobs:
       env:
         HDFLIBS: ${{ steps.set-hdflib-name.outputs.HDFLIB_ENV }}
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
+        BINSIGN: ${{ steps.set-signing-state.BINSIGN }}
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
         AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -456,7 +457,7 @@ jobs:
     - name: Check Secrets exists
       id: set-signing-state
       run: |
-        if [ '${{ secrets.AZURE_ENDPOINT }}' != '' ];
+        if [ '${{ secrets.APPLE_CERTS_BASE64 }}' != '' ];
         then
           SIGN_VAL=$(echo "true");
         else
@@ -602,6 +603,7 @@ jobs:
       env:
         HDFLIBS: ${{ steps.set-hdflib-name.outputs.HDFLIB_ENV }}
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
+        BINSIGN: ${{ steps.set-signing-state.BINSIGN }}
         KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
         KEYCHAIN_NAME: ${{ vars.KEYCHAIN_NAME }}
         SIGNER: ${{ vars.SIGNER }}

diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -237,6 +237,7 @@ jobs:
       env:
         HDFLIBS: ${{ steps.set-hdflib-name.outputs.HDFLIB_ENV }}
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
+        BINSIGN: ${{ steps.set-signing-state.BINSIGN }}
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
         AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
         AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
@@ -457,7 +458,7 @@ jobs:
     - name: Check Secrets exists
       id: set-signing-state
       run: |
-        if [ '${{ secrets.AZURE_ENDPOINT }}' != '' ];
+        if [ '${{ secrets.APPLE_CERTS_BASE64 }}' != '' ];
         then
           SIGN_VAL=$(echo "true");
         else
@@ -603,6 +604,7 @@ jobs:
       env:
         HDFLIBS: ${{ steps.set-hdflib-name.outputs.HDFLIB_ENV }}
         HDF5LIBS: ${{ steps.set-hdf5lib-name.outputs.HDF5LIB_ENV }}
+        BINSIGN: ${{ steps.set-signing-state.BINSIGN }}
         KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
         KEYCHAIN_NAME: ${{ vars.KEYCHAIN_NAME }}
         SIGNER: ${{ vars.SIGNER }}

diff --git a/build.xml b/build.xml
@@ -15,9 +15,9 @@
 
     <record name="antoutput.log" action="start" append="${build.antoutput.append}" loglevel="verbose" />
 
-    <property name="sign_state" value="sign" />
+    <property name="sign_state" value="${env.BINSIGN}" />
     <condition property="sign.enable">
-        <equals arg1="${sign_state}" arg2="sign" />
+        <equals arg1="${sign_state}" arg2="true" />
     </condition>
     <!-- MAC signing: -->
     <property name="sign.account" value="${env.SIGNER}" />