diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml index c816c678b..3fa993fc1 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -28,7 +28,7 @@ runs: uses: actions/download-artifact@v4 with: name: ${{ inputs.artifact }} - path: _artifacts + path: _output - name: Download UI Artifact uses: actions/download-artifact@v4 diff --git a/.github/actions/package/package.sh b/.github/actions/package/package.sh index b47803e90..271d269bf 100755 --- a/.github/actions/package/package.sh +++ b/.github/actions/package/package.sh @@ -5,7 +5,7 @@ artifactsFolder=_artifacts uiFolder="$outputFolder/UI" framework="${FRAMEWORK:=net6.0}" -for runtime in _artifacts/* +for runtime in _output/* do name="${runtime##*/}" folderName="$runtime/$framework" @@ -41,7 +41,7 @@ do rm -r $packageFolder/Sonarr.app/Contents/MacOS/Sonarr.Update echo "Packaging macOS app Artifact" - (cd $packageFolder; zip -rq "../../$archiveName-app.zip" ./Sonarr.app) + (cd $packageFolder; zip -rq "../../../$artifactsFolder/$archiveName-app.zip" ./Sonarr.app) fi echo "Packaging Artifact" @@ -52,9 +52,9 @@ do if [[ "$name" == *"win"* ]]; then if [ "$RUNNER_OS" = "Windows" ] then - (cd $folderName; 7z a -tzip "../../$archiveName.zip" ./Sonarr) + (cd $folderName; 7z a -tzip "../../../$artifactsFolder/$archiveName.zip" ./Sonarr) else - (cd $folderName; zip -rq "../../$archiveName.zip" ./Sonarr) + (cd $folderName; zip -rq "../../../$artifactsFolder/$archiveName.zip" ./Sonarr) fi fi done diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 0ada21297..468bfc41d 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -60,12 +60,12 @@ runs: uses: actions/download-artifact@v4 with: name: ${{ inputs.binary_artifact }} - path: _artifacts + path: _output - name: Set up binary artifact if: ${{ inputs.binary_path != '' }} shell: bash - run: mv ./_artifacts/${{inputs.binary_path}} _tests/bin + run: mv ./_output/${{inputs.binary_path}} _tests/bin - name: Make executable if: startsWith(inputs.os, 'windows') != true