mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-05 15:47:20 +02:00
@cosmetic Hopefully fixed nunit randomly failing. (updated nunit and mono)
This commit is contained in:
parent
65267af512
commit
961fe70cb8
@ -1,10 +1,10 @@
|
|||||||
FROM mono:5.8
|
FROM mono:5.18
|
||||||
|
|
||||||
RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y git ssh tar gzip ca-certificates wget zip wine wine32 wine64 libwine libwine:i386
|
RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y git ssh tar gzip ca-certificates wget zip wine wine32 wine64 libwine libwine:i386
|
||||||
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -E -
|
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -E -
|
||||||
RUN apt-get install -y nodejs
|
RUN apt-get install -y nodejs
|
||||||
RUN wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-5_all.deb && dpkg -i repo-mediaarea_1.0-5_all.deb && apt-get update
|
RUN wget https://mediaarea.net/repo/deb/repo-mediaarea_1.0-7_all.deb && dpkg -i repo-mediaarea_1.0-7_all.deb && apt-get update
|
||||||
RUN apt-get install -y libmediainfo-dev libmediainfo0 mediainfo
|
RUN apt-get install -y libmediainfo-dev libmediainfo0v5 mediainfo
|
||||||
RUN npm i -g npm
|
RUN npm i -g npm
|
||||||
RUN apt-get install -y python3-pip && pip3 install gitchangelog pystache
|
RUN apt-get install -y python3-pip && pip3 install gitchangelog pystache
|
||||||
RUN curl -O https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz && tar xvf go*.tar.gz && chown -R root:root ./go && mv go /usr/local
|
RUN curl -O https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz && tar xvf go*.tar.gz && chown -R root:root ./go && mv go /usr/local
|
||||||
|
@ -2,7 +2,7 @@ version: 2
|
|||||||
|
|
||||||
defaults: &defaults
|
defaults: &defaults
|
||||||
docker:
|
docker:
|
||||||
- image: gallileo/radarr-cci-primary:5.8.8
|
- image: gallileo/radarr-cci-primary:5.8.9
|
||||||
environment:
|
environment:
|
||||||
BUILD_VERSION: 0.2.0
|
BUILD_VERSION: 0.2.0
|
||||||
|
|
||||||
|
4
build.sh
4
build.sh
@ -221,9 +221,9 @@ PackageTests()
|
|||||||
find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
|
find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
|
||||||
|
|
||||||
if [ $runtime = "dotnet" ] ; then
|
if [ $runtime = "dotnet" ] ; then
|
||||||
$nuget install NUnit.Runners -Version 3.2.1 -Output $testPackageFolder
|
$nuget install NUnit.Runners -Version 3.9.0 -Output $testPackageFolder
|
||||||
else
|
else
|
||||||
mono $nuget install NUnit.Runners -Version 3.2.1 -Output $testPackageFolder
|
mono $nuget install NUnit.Runners -Version 3.9.0 -Output $testPackageFolder
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp $outputFolder/*.dll $testPackageFolder
|
cp $outputFolder/*.dll $testPackageFolder
|
||||||
|
4
test.sh
4
test.sh
@ -9,7 +9,7 @@ if [ -d "$TEST_DIR/_tests" ]; then
|
|||||||
TEST_DIR="$TEST_DIR/_tests"
|
TEST_DIR="$TEST_DIR/_tests"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe"
|
NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.9.0/tools/nunit3-console.exe"
|
||||||
NUNIT_COMMAND="$NUNIT"
|
NUNIT_COMMAND="$NUNIT"
|
||||||
NUNIT_PARAMS="--result=$TEST_DIR/reports/junit/results-$TYPE.xml;transform=.circleci/nunit3-junit.xslt --agents=12 --config=Debug"
|
NUNIT_PARAMS="--result=$TEST_DIR/reports/junit/results-$TYPE.xml;transform=.circleci/nunit3-junit.xslt --agents=12 --config=Debug"
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ if [ "$PLATFORM" = "Windows" ]; then
|
|||||||
WHERE="$WHERE && cat != LINUX"
|
WHERE="$WHERE && cat != LINUX"
|
||||||
elif [ "$PLATFORM" = "Linux" ]; then
|
elif [ "$PLATFORM" = "Linux" ]; then
|
||||||
WHERE="$WHERE && cat != WINDOWS"
|
WHERE="$WHERE && cat != WINDOWS"
|
||||||
NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"
|
NUNIT_COMMAND="mono --debug $NUNIT"
|
||||||
elif [ "$PLATFORM" = "Mac" ]; then
|
elif [ "$PLATFORM" = "Mac" ]; then
|
||||||
WHERE="$WHERE && cat != WINDOWS"
|
WHERE="$WHERE && cat != WINDOWS"
|
||||||
NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"
|
NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT"
|
||||||
|
Loading…
Reference in New Issue
Block a user