mirror of
https://github.com/Radarr/Radarr
synced 2025-01-03 13:54:29 +00:00
Fix build for bad azure update
This commit is contained in:
parent
6cb504cb08
commit
92f7b25117
3 changed files with 6 additions and 27 deletions
|
@ -82,8 +82,8 @@ stages:
|
|||
find ${OUTPUTFOLDER} -depth -empty -type d -exec rm -r "{}" \;
|
||||
find ${TESTSFOLDER} -type f ! -path "*/publish/*" -exec rm -rf {} \;
|
||||
find ${TESTSFOLDER} -depth -empty -type d -exec rm -r "{}" \;
|
||||
ls -lR
|
||||
displayName: Clean up intermediate output
|
||||
condition: and(succeeded(), ne(variables['osName'], 'Windows'))
|
||||
- publish: $(outputFolder)
|
||||
artifact: '$(osName)Backend'
|
||||
displayName: Publish Backend
|
||||
|
@ -355,6 +355,7 @@ stages:
|
|||
condition: and(succeeded(), eq(variables['osName'], 'Mac'))
|
||||
- bash: find ${TESTSFOLDER} -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
|
||||
displayName: Make Test Dummy Executable
|
||||
condition: and(succeeded(), ne(variables['osName'], 'Windows'))
|
||||
- task: Bash@3
|
||||
displayName: Run Tests
|
||||
env:
|
||||
|
@ -576,7 +577,6 @@ stages:
|
|||
- bash: |
|
||||
mkdir -p ./bin/
|
||||
cp -r -v ${BUILD_ARTIFACTSTAGINGDIRECTORY}/bin/Radarr/. ./bin/
|
||||
ls -lR
|
||||
displayName: Move Package Contents
|
||||
- task: Bash@3
|
||||
displayName: Run Integration Tests
|
||||
|
@ -661,7 +661,6 @@ stages:
|
|||
mv geckodriver _tests
|
||||
displayName: Install Gecko Driver
|
||||
condition: and(succeeded(), ne(variables['osName'], 'Windows'))
|
||||
- bash: ls -lR
|
||||
- task: Bash@3
|
||||
displayName: Run Automation Tests
|
||||
inputs:
|
||||
|
|
21
build.sh
21
build.sh
|
@ -25,23 +25,6 @@ UpdateVersionNumber()
|
|||
fi
|
||||
}
|
||||
|
||||
CleanFolder()
|
||||
{
|
||||
local path=$1
|
||||
|
||||
find $path -name "*.transform" -exec rm "{}" \;
|
||||
|
||||
echo "Removing FluentValidation.Resources files"
|
||||
find $path -name "FluentValidation.resources.dll" -exec rm "{}" \;
|
||||
find $path -name "App.config" -exec rm "{}" \;
|
||||
|
||||
echo "Removing vshost files"
|
||||
find $path -name "*.vshost.exe" -exec rm "{}" \;
|
||||
|
||||
echo "Removing Empty folders"
|
||||
find $path -depth -empty -type d -exec rm -r "{}" \;
|
||||
}
|
||||
|
||||
LintUI()
|
||||
{
|
||||
ProgressStart 'ESLint'
|
||||
|
@ -105,8 +88,6 @@ PackageFiles()
|
|||
cp -r $outputFolder/Radarr.Update/$framework/$runtime/publish $folder/Radarr.Update
|
||||
cp -r $outputFolder/UI $folder
|
||||
|
||||
CleanFolder $folder
|
||||
|
||||
echo "Adding LICENSE"
|
||||
cp LICENSE $folder
|
||||
}
|
||||
|
@ -209,8 +190,6 @@ PackageTests()
|
|||
unzip -o gecko.zip
|
||||
cp geckodriver.exe $testPackageFolder/netcoreapp3.1/win-x64/publish
|
||||
|
||||
CleanFolder $testPackageFolder
|
||||
|
||||
ProgressEnd 'Creating Test Package'
|
||||
}
|
||||
|
||||
|
|
7
test.sh
7
test.sh
|
@ -4,7 +4,8 @@ TYPE=$2
|
|||
COVERAGE=$3
|
||||
WHERE="Category!=ManualTest"
|
||||
TEST_PATTERN="*Test.dll"
|
||||
ASSEMBLIES=""
|
||||
FILES=( "Radarr.Api.Test.dll" "Radarr.Automation.Test.dll" "Radarr.Common.Test.dll" "Radarr.Core.Test.dll" "Radarr.Host.Test.dll" "Radarr.Integration.Test.dll" "Radarr.Libraries.Test.dll" "Radarr.Mono.Test.dll" "Radarr.Update.Test.dll" "Radarr.Windows.Test.dll" )
|
||||
ASSMEBLIES=""
|
||||
TEST_LOG_FILE="TestLog.txt"
|
||||
|
||||
echo "test dir: $TEST_DIR"
|
||||
|
@ -55,8 +56,8 @@ else
|
|||
exit 2
|
||||
fi
|
||||
|
||||
for i in `find $TEST_DIR -name "$TEST_PATTERN"`;
|
||||
do ASSEMBLIES="$ASSEMBLIES $i"
|
||||
for i in "${FILES[@]}";
|
||||
do ASSEMBLIES="$ASSEMBLIES $TEST_DIR/$i"
|
||||
done
|
||||
|
||||
DOTNET_PARAMS="$ASSEMBLIES --TestCaseFilter:$WHERE $VSTEST_PARAMS"
|
||||
|
|
Loading…
Reference in a new issue