From 9475021af3114c7fdb2c40f260b8e46665efd5f3 Mon Sep 17 00:00:00 2001 From: Dan German Date: Thu, 11 Apr 2024 18:09:18 +0300 Subject: [PATCH] work --- .github/workflows/build-linux.yml | 15 +++------------ .github/workflows/build-macos-13.yml | 26 ++++++++++++-------------- .github/workflows/build-macos.yml | 9 ++++----- .github/workflows/build-windows.yml | 13 ++++++------- .github/workflows/upload-to-s3.yml | 7 ------- 5 files changed, 25 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 1ad6ce1..02aca95 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -1,12 +1,10 @@ -# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml name: Build Linux on: workflow_dispatch: pull_request: - # push: - # branches: - # - main + push: + branches: + - main env: BUILD_TYPE: Release jobs: @@ -36,16 +34,9 @@ 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 secrets: inherit with: file-name: blocks_linux - final-file-name: blocks_linux diff --git a/.github/workflows/build-macos-13.yml b/.github/workflows/build-macos-13.yml index 42a94a8..24333d3 100644 --- a/.github/workflows/build-macos-13.yml +++ b/.github/workflows/build-macos-13.yml @@ -1,12 +1,10 @@ -# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. -# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml name: Build macOS 13 (Intel) on: workflow_dispatch: pull_request: - # push: - # branches: - # - main + push: + branches: + - main env: BUILD_TYPE: Release jobs: @@ -51,18 +49,18 @@ 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_intel.dmg + codesign -s "${{ secrets.DEVELOPER_ID_APPLICATION }}" --timestamp -i com.soonth.blocks --force blocks_mac_intel.dmg + xcrun notarytool submit blocks_mac_intel.dmg --apple-id ${{ secrets.NOTARIZATION_USERNAME }} --password ${{ secrets.NOTARIZATION_PASSWORD }} --team-id ${{ secrets.TEAM_ID }} --wait + xcrun stapler staple blocks_mac_intel.dmg - name: Upload built files uses: actions/upload-artifact@v3.1.2 with: - name: blocks.dmg - path: packaging/blocks.dmg + name: blocks_mac_intel.dmg + path: packaging/blocks_mac_intel.dmg upload-to-s3: uses: ./.github/workflows/upload-to-s3.yml - with: - workflow-name: build-macos-13.yml secrets: inherit - needs: build \ No newline at end of file + needs: build + with: + file-name: blocks_mac_intel.dmg diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 2c4f4f0..aec43df 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -4,9 +4,9 @@ name: Build macOS (M1) on: workflow_dispatch: pull_request: - # push: - # branches: - # - main + push: + branches: + - main env: BUILD_TYPE: Release jobs: @@ -65,5 +65,4 @@ jobs: uses: ./.github/workflows/upload-to-s3.yml secrets: inherit with: - file-name: blocks_mac.dmg - final-file-name: blocks_mac \ No newline at end of file + file-name: blocks_mac.dmg \ No newline at end of file diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index c5f9c6a..ef8adbc 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -2,9 +2,9 @@ name: Build Windows on: workflow_dispatch: pull_request: - # push: - # branches: - # - main + push: + branches: + - main env: BUILD_TYPE: Release jobs: @@ -26,7 +26,7 @@ jobs: - name: Upload built files uses: actions/upload-artifact@v3.1.2 with: - name: blocks + name: blocks_win path: | 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 @@ -34,6 +34,5 @@ jobs: needs: build uses: ./.github/workflows/upload-to-s3.yml secrets: inherit - with: - file-name: block - final-file-name: blocks_windows \ No newline at end of file + with: + file-name: blocks_win diff --git a/.github/workflows/upload-to-s3.yml b/.github/workflows/upload-to-s3.yml index afa9526..53c4e8a 100644 --- a/.github/workflows/upload-to-s3.yml +++ b/.github/workflows/upload-to-s3.yml @@ -5,9 +5,6 @@ on: file-name: required: true type: string - final-file-name: - required: true - type: string jobs: upload-to-s3: runs-on: ubuntu-latest @@ -16,10 +13,6 @@ 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: zip uses: montudor/action-zip@v1 with: