Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix paths used during test and packaging

This commit is contained in:
Mark McDowall 2024-01-07 11:02:55 -08:00
parent af8ad3e758
commit 5298ece3f7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/package/action.yml vendored
View File

@ -28,7 +28,7 @@ runs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.artifact }} name: ${{ inputs.artifact }}
path: _artifacts path: _output
- name: Download UI Artifact - name: Download UI Artifact
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4

8
.github/actions/package/package.sh vendored
View File

@ -5,7 +5,7 @@ artifactsFolder=_artifacts
uiFolder="$outputFolder/UI" uiFolder="$outputFolder/UI"
framework="${FRAMEWORK:=net6.0}" framework="${FRAMEWORK:=net6.0}"
for runtime in _artifacts/* for runtime in _output/*
do do
name="${runtime##*/}" name="${runtime##*/}"
folderName="$runtime/$framework" folderName="$runtime/$framework"
@ -41,7 +41,7 @@ do
rm -r $packageFolder/Sonarr.app/Contents/MacOS/Sonarr.Update rm -r $packageFolder/Sonarr.app/Contents/MacOS/Sonarr.Update
echo "Packaging macOS app Artifact" 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 fi
echo "Packaging Artifact" echo "Packaging Artifact"
@ -52,9 +52,9 @@ do
if [[ "$name" == *"win"* ]]; then if [[ "$name" == *"win"* ]]; then
if [ "$RUNNER_OS" = "Windows" ] if [ "$RUNNER_OS" = "Windows" ]
then then
(cd $folderName; 7z a -tzip "../../$archiveName.zip" ./Sonarr) (cd $folderName; 7z a -tzip "../../../$artifactsFolder/$archiveName.zip" ./Sonarr)
else else
(cd $folderName; zip -rq "../../$archiveName.zip" ./Sonarr) (cd $folderName; zip -rq "../../../$artifactsFolder/$archiveName.zip" ./Sonarr)
fi fi
fi fi
done done

4
.github/actions/test/action.yml vendored
View File

@ -60,12 +60,12 @@ runs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: ${{ inputs.binary_artifact }} name: ${{ inputs.binary_artifact }}
path: _artifacts path: _output
- name: Set up binary artifact - name: Set up binary artifact
if: ${{ inputs.binary_path != '' }} if: ${{ inputs.binary_path != '' }}
shell: bash shell: bash
run: mv ./_artifacts/${{inputs.binary_path}} _tests/bin run: mv ./_output/${{inputs.binary_path}} _tests/bin
- name: Make executable - name: Make executable
if: startsWith(inputs.os, 'windows') != true if: startsWith(inputs.os, 'windows') != true