From 16b198ba4ee33419951b7c8e021ee7537df73c9a Mon Sep 17 00:00:00 2001
From: Matthew Maxwell <maxwellmattryan@gmail.com>
Date: Sat, 16 Nov 2024 15:29:25 -0600
Subject: [PATCH] Try different rename strategy

---
 .github/workflows/cd.release.yml       | 13 +++++++------
 .github/workflows/reusable.package.yml | 21 ++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cd.release.yml b/.github/workflows/cd.release.yml
index 241b745..731501b 100644
--- a/.github/workflows/cd.release.yml
+++ b/.github/workflows/cd.release.yml
@@ -84,9 +84,8 @@ jobs:
           echo "STAGE=$STAGE" >> $GITHUB_ENV
           echo "STAGE_VERSION=$STAGE_VERSION" >> $GITHUB_ENV
           echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
-
-          echo "WINDOWS_ARTIFACT_NAME=$PLUGIN_NAME-$PLUGIN_VERSION-Windows" >> $GITHUB_ENV
-          echo "MACOS_ARTIFACT_NAME=$PLUGIN_NAME-$PLUGIN_VERSION-macOS" >> $GITHUB_ENV
+          echo "INSTALLER_NAME_HYPHENATED=$PLUGIN_NAME-$PLUGIN_VERSION-Installer" >> $GITHUB_ENV
+          echo "INSTALLER_NAME_SPACED=$PLUGIN_NAME $PLUGIN_VERSION Installer" >> $GITHUB_ENV
 
       - name: Check Tag & Version
         run: |
@@ -114,9 +113,11 @@ jobs:
 
       - name: Upload to Cloud Storage
         run: |
-          for file in *.{dmg,exe}; do mv -- "$file" "$(echo "$file" | sed 's/-/ /g')"; done
-          gcloud storage cp "**/*.dmg" "gs://${{ secrets.GOOGLE_CLOUD_STORAGE_BUCKET }}/${{ env.STAGE }}"
-          gcloud storage cp "**/*.exe" "gs://${{ secrets.GOOGLE_CLOUD_STORAGE_BUCKET }}/${{ env.STAGE }}"
+          ls
+          mv "${{ env.INSTALLER_NAME_HYPHENATED }}/${{ env.INSTALLER_NAME_HYPHENATED }}.dmg" "./${{ env.INSTALLER_NAME_SPACED }}.dmg"
+          gcloud storage cp "${{ env.INSTALLER_NAME_SPACED }}.dmg" "gs://${{ secrets.GOOGLE_CLOUD_STORAGE_BUCKET }}/${{ env.STAGE }}"
+          mv "${{ env.INSTALLER_NAME_HYPHENATED }}/${{ env.INSTALLER_NAME_HYPHENATED }}.exe" "./${{ env.INSTALLER_NAME_SPACED }}.exe"
+          gcloud storage cp "${{ env.INSTALLER_NAME_SPACED }}.exe" "gs://${{ secrets.GOOGLE_CLOUD_STORAGE_BUCKET }}/${{ env.STAGE }}"
 
       - name: Prepare Body
         run: |
diff --git a/.github/workflows/reusable.package.yml b/.github/workflows/reusable.package.yml
index 08b034f..a9000f7 100644
--- a/.github/workflows/reusable.package.yml
+++ b/.github/workflows/reusable.package.yml
@@ -43,8 +43,7 @@ jobs:
           echo "VST3_PATH=${{ inputs.plugin_name }}.vst3" >> $GITHUB_ENV
           echo "AU_PATH=${{ inputs.plugin_name }}.component" >> $GITHUB_ENV
           echo "ARTIFACT_NAME=${{ inputs.plugin_name }}-${{ inputs.plugin_version }}-${{ runner.os }}" >> $GITHUB_ENV
-          echo "MAC_INSTALLER_NAME=${{ inputs.plugin_name}}-${{ inputs.plugin_version }}-Installer" >> $GITHUB_ENV
-          echo "WIN_INSTALLER_NAME=${{ inputs.plugin_name}} ${{ inputs.plugin_version }} Installer" >> $GITHUB_ENV
+          echo "INSTALLER_NAME=${{ inputs.plugin_name}}-${{ inputs.plugin_version }}-Installer" >> $GITHUB_ENV
 
       - name: Import Certificates (MacOS)
         uses: apple-actions/import-codesign-certs@v3
@@ -95,17 +94,17 @@ jobs:
           mv packaging/build/signed/${{ inputs.plugin_name }}.pkg packaging/dmg
           
           # Create the .dmg
-          cd packaging && appdmg dmg.json "${{ env.MAC_INSTALLER_NAME }}.dmg"
-          codesign -s "${{ secrets.DEVELOPER_ID_APP }}" --timestamp -i ${{ inputs.plugin_bundle_id }} --force "${{ env.MAC_INSTALLER_NAME }}.dmg"
-          xcrun notarytool submit "${{ env.MAC_INSTALLER_NAME }}.dmg" --apple-id ${{ secrets.APPLE_NOTARIZATION_USERNAME }} --password ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} --team-id ${{ secrets.DEVELOPER_TEAM_ID }} --wait
-          xcrun stapler staple "${{ env.MAC_INSTALLER_NAME }}.dmg"
+          cd packaging && appdmg dmg.json "${{ env.INSTALLER_NAME }}.dmg"
+          codesign -s "${{ secrets.DEVELOPER_ID_APP }}" --timestamp -i ${{ inputs.plugin_bundle_id }} --force "${{ env.INSTALLER_NAME }}.dmg"
+          xcrun notarytool submit "${{ env.INSTALLER_NAME }}.dmg" --apple-id ${{ secrets.APPLE_NOTARIZATION_USERNAME }} --password ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} --team-id ${{ secrets.DEVELOPER_TEAM_ID }} --wait
+          xcrun stapler staple "${{ env.INSTALLER_NAME }}.dmg"
 
       - name: Upload Installer (MacOS)
         if: ${{ runner.os == 'macOS' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.MAC_INSTALLER_NAME }}
-          path: packaging/${{ env.MAC_INSTALLER_NAME }}.dmg
+          name: ${{ env.INSTALLER_NAME }}
+          path: packaging/${{ env.INSTALLER_NAME }}.dmg
 
       - name: Cache IPP (Windows)
         if: ${{ runner.os == 'Windows' }}
@@ -133,11 +132,11 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
         run: |
           iscc "packaging\${{ inputs.plugin_name }}.iss"
-          mv "packaging\Output\${{ env.WIN_INSTALLER_NAME }}.exe" .
+          mv "packaging\Output\${{ env.INSTALLER_NAME }}.exe" .
 
       - name: Upload Installer (Windows)
         if: ${{ runner.os == 'Windows' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.WIN_INSTALLER_NAME }}
-          path: ${{ env.WIN_INSTALLER_NAME }}.exe
+          name: ${{ env.INSTALLER_NAME }}
+          path: ${{ env.INSTALLER_NAME }}.exe