work

dan-german · Apr 11, 2024 · a80ef5d · a80ef5d
1 parent e6d7109
commit a80ef5d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -36,9 +36,16 @@ jobs:
           path: |
             ${{github.workspace}}/build/blocks_artefacts/Release/Standalone
             ${{github.workspace}}/build/blocks_artefacts/Release/VST3
+  # upload-to-s3:
+  #   uses: ./.github/workflows/upload-to-s3.yml
+  #   with:
+  #     workflow-name: build-linux.yml
+  #   secrets: inherit
+  #   needs: build
   upload-to-s3:
+    needs: build
     uses: ./.github/workflows/upload-to-s3.yml
-    with:
-      workflow-name: build-linux.yml
     secrets: inherit
-    needs: build
+    with: 
+      file-name: blocks_linux
+      final-file-name: blocks_linux    
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -51,19 +51,19 @@ jobs:
           mv "/Users/runner/work/blocks/blocks/build/blocks_artefacts/Release/Standalone/blocks.app" packaging/dmg
 
           # Run appdmg to create the .dmg
-          cd packaging && appdmg dmg.json blocks.dmg
-          codesign -s "${{ secrets.DEVELOPER_ID_APPLICATION }}" --timestamp -i com.soonth.blocks --force blocks.dmg
-          xcrun notarytool submit blocks.dmg --apple-id ${{ secrets.NOTARIZATION_USERNAME }} --password ${{ secrets.NOTARIZATION_PASSWORD }} --team-id ${{ secrets.TEAM_ID }} --wait
-          xcrun stapler staple blocks.dmg
+          cd packaging && appdmg dmg.json blocks_mac.dmg
+          codesign -s "${{ secrets.DEVELOPER_ID_APPLICATION }}" --timestamp -i com.soonth.blocks --force blocks_mac.dmg
+          xcrun notarytool submit blocks_mac.dmg --apple-id ${{ secrets.NOTARIZATION_USERNAME }} --password ${{ secrets.NOTARIZATION_PASSWORD }} --team-id ${{ secrets.TEAM_ID }} --wait
+          xcrun stapler staple blocks_mac.dmg
       - name: Upload built files
         uses: actions/upload-artifact@v4
         with:
-          name: blocks.dmg
-          path: packaging/blocks.dmg
+          name: blocks_mac.dmg
+          path: packaging/blocks_mac.dmg
   upload-to-s3:
     needs: build
     uses: ./.github/workflows/upload-to-s3.yml
     secrets: inherit
     with: 
-      file-name: blocks.dmg
+      file-name: blocks_mac.dmg
       final-file-name: blocks_mac
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -31,8 +31,9 @@ jobs:
             D:/a/blocks/blocks/build/blocks_artefacts/Release/VST3/blocks.vst3/Contents/x86_64-win/blocks.vst3
             D:/a/blocks/blocks/build/blocks_artefacts/Release/Standalone/blocks.exe
   upload-to-s3:
+    needs: build
     uses: ./.github/workflows/upload-to-s3.yml
-    with:
-      workflow-name: build-windows.yml
     secrets: inherit
-    needs: build
+    with: 
+      file-name: block
+      final-file-name: blocks_windows
diff --git a/.github/workflows/upload-to-s3.yml b/.github/workflows/upload-to-s3.yml
@@ -16,14 +16,14 @@ jobs:
         run: pwd
       - name: Download build-output artifact
         uses: actions/download-artifact@v4
-      - name: Rename file
-        run: mv ${{ inputs.file-name }} ${{ inputs.final-file-name }}
-      - name: Delete old file
-        run: rm -f ${{ inputs.file-name }}
+      # - name: Rename file
+      #   run: mv ${{ inputs.file-name }} ${{ inputs.final-file-name }}
+      # - name: Delete old file
+      #   run: rm -f ${{ inputs.file-name }}
       - name: zip
         uses: montudor/action-zip@v1
         with:
-          args: zip -qq -r ${{ inputs.final-file-name }}.zip ${{ inputs.final-file-name }}
+          args: zip -qq -r ${{ inputs.file-name }}.zip ${{ inputs.file-name }}
       - name: Upload to S3
         uses: shallwefootball/s3-upload-action@master
         with: