Fix production targets directory path

autonomys · Jan 18, 2024 · a19d182 · a19d182
1 parent f18394a
commit a19d182
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,6 +52,7 @@ jobs:
     runs-on: ${{ matrix.build.os }}
 
     env:
+      PRODUCTION_TARGET: target/${{ matrix.build.target }}/production
       RUSTFLAGS: ${{ matrix.build.rustflags }}
     # TODO: use the commented out one when this issue is resolved: https://github.com/tokio-rs/console/issues/299
     # RUSTFLAGS: ${{ matrix.build.rustflags }} --cfg tokio_unstable
@@ -146,11 +147,11 @@ jobs:
           security import certificate.p12 -k build.keychain -P "${{ secrets.MACOS_CERTIFICATE_PASSWORD }}" -T /usr/bin/codesign
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${{ secrets.MACOS_CERTIFICATE_PASSWORD }}" build.keychain
           echo "Signing farmer"
-          codesign --force --options=runtime --entitlements .github/workflows/Entitlements.plist -s "${{ secrets.MACOS_IDENTITY }}" --timestamp ${{ matrix.build.production_target }}/pulsar
+          codesign --force --options=runtime --entitlements .github/workflows/Entitlements.plist -s "${{ secrets.MACOS_IDENTITY }}" --timestamp ${{ env.PRODUCTION_TARGET }}/pulsar
           echo "Creating an archive"
-          mkdir ${{ matrix.build.production_target }}/macos-binaries
-          cp ${{ matrix.build.production_target }}/pulsar ${{ matrix.build.production_target }}/macos-binaries
-          ditto -c -k --rsrc ${{ matrix.build.production_target }}/macos-binaries subspace-binaries.zip
+          mkdir ${{ env.PRODUCTION_TARGET }}/macos-binaries
+          cp ${{ env.PRODUCTION_TARGET }}/pulsar ${{ env.PRODUCTION_TARGET }}/macos-binaries
+          ditto -c -k --rsrc ${{ env.PRODUCTION_TARGET }}/macos-binaries subspace-binaries.zip
           echo "Notarizing"
           brew update
           brew install mitchellh/gon/gon
@@ -181,20 +182,20 @@ jobs:
 
       - name: Sign Application (Windows)
         run: |
-          AzureSignTool sign --azure-key-vault-url "${{ secrets.AZURE_KEY_VAULT_URI }}" --azure-key-vault-client-id "${{ secrets.AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.AZURE_TENANT_ID }}" --azure-key-vault-certificate "${{ secrets.AZURE_CERT_NAME }}" --file-digest sha512 --timestamp-rfc3161 http://timestamp.digicert.com -v "${{ matrix.build.production_target }}/pulsar.exe"
+          AzureSignTool sign --azure-key-vault-url "${{ secrets.AZURE_KEY_VAULT_URI }}" --azure-key-vault-client-id "${{ secrets.AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.AZURE_TENANT_ID }}" --azure-key-vault-certificate "${{ secrets.AZURE_CERT_NAME }}" --file-digest sha512 --timestamp-rfc3161 http://timestamp.digicert.com -v "${{ env.PRODUCTION_TARGET }}/pulsar.exe"
         continue-on-error: ${{ github.repository_owner != 'subspace' || github.event_name != 'push' || github.ref_type != 'tag' }}
         if: runner.os == 'Windows'
 
       - name: Prepare executables for uploading (Ubuntu)
         run: |
           mkdir executables
-          mv ${{ matrix.build.production_target }}/pulsar executables/pulsar-${{ matrix.build.suffix }}
+          mv ${{ env.PRODUCTION_TARGET }}/pulsar executables/pulsar-${{ matrix.build.suffix }}
         if: runner.os == 'Linux'
 
       - name: Prepare executables for uploading (macOS)
         run: |
           mkdir executables
-          mv ${{ matrix.build.production_target }}/pulsar executables/pulsar-${{ matrix.build.suffix }}
+          mv ${{ env.PRODUCTION_TARGET }}/pulsar executables/pulsar-${{ matrix.build.suffix }}
           # Zip it so that signature is not lost
           ditto -c -k --rsrc executables/pulsar-${{ matrix.build.suffix }} executables/pulsar-${{ matrix.build.suffix }}.zip
           rm executables/pulsar-${{ matrix.build.suffix }}
@@ -203,7 +204,7 @@ jobs:
       - name: Prepare executables for uploading (Windows)
         run: |
           mkdir executables
-          move ${{ matrix.build.production_target }}/pulsar.exe executables/pulsar-${{ matrix.build.suffix }}.exe
+          mv ${{ env.PRODUCTION_TARGET }}/pulsar.exe executables/pulsar-${{ matrix.build.suffix }}.exe
         if: runner.os == 'Windows'
 
       - name: Upload executable to artifacts