From 446d61ebc994bcc2cd0a6e50c37f4ef1a970c2b7 Mon Sep 17 00:00:00 2001 From: Dylan Marcus Date: Fri, 19 Jan 2024 14:48:45 -0500 Subject: [PATCH] path fixes for packaging step --- .github/workflows/juce_ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/juce_ci.yml b/.github/workflows/juce_ci.yml index 1d6d202..d0bf1ab 100644 --- a/.github/workflows/juce_ci.yml +++ b/.github/workflows/juce_ci.yml @@ -87,21 +87,22 @@ jobs: shell: bash run: cmake --build build --config $BUILD_TYPE - - uses: akiojin/generate-mac-installer-github-action@v0.1.0 + - name: OC Package (macos) + uses: akiojin/generate-mac-installer-github-action@v0.1.0 with: root-directory: ${{ github.workspace }}/osc_client/build/M1-OrientationOSC_artefacts/Release bundle-path: M1-OrientationOSC.app identifier: ${{ env.OC_BUNDLE_ID }} - install-location: /Application/Mach1 + install-location: /Application/Mach1/OSC-Tool version: ${{ env.VERSION }} - output-path: ${{ github.workspace }}/osc_client/build/m1-orientationmanager_artefacts/Release + output-directory: ${{ github.workspace }}/osc_client/build/m1-OrientationOSC_artefacts/Release - name: OC Notarize (macos) if: runner.os == 'MacOS' uses: cocoalibs/xcode-notarization-action@v1 with: working-directory: osc_client - app-path: build/m1-M1-OrientationOSC_artefacts/M1-OrientationOSC.pkg + app-path: build/M1-OrientationOSC_artefacts/Release/M1-OrientationOSC.pkg apple-id: ${{ secrets.MACOS_NOTARIZE_USER }} password: ${{ secrets.MACOS_NOTARIZE_PWD }} team-id: ${{ secrets.TEAM_ID }} @@ -112,7 +113,7 @@ jobs: if: runner.os == 'Windows' working-directory: osc_client/build run: | - "%programfiles(x86)%\Inno Setup 6\iscc.exe" /DBuildDir="${{github.workspace}}\osc_client\build\m1-M1-OrientationOSC_artefacts\Release" "${{github.workspace}}\osc_client\Resources\InnoSetup.iss" + "%programfiles(x86)%\Inno Setup 6\iscc.exe" /DBuildDir="${{github.workspace}}\osc_client" "${{github.workspace}}\osc_client\Resources\InnoSetup.iss" shell: cmd - name: 'OC Upload Artifact (macos)'