diff --git a/.appveyor.yml b/.appveyor.yml index 7b33b5db2..4dc59d492 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,10 +4,13 @@ configuration: Debug platform: Any CPU environment: AUTOUPDATER_Duplicati_SKIP_UPDATE: 1 - UNITTEST_BASEFOLDER: C:\projects\duplicati\testdata COVERALLS_REPO_TOKEN: secure: szQsrkP5rvra8L60SomD73/dFvRwot0UuyA566zqzI2qmLOr+MhLN0AyC8BTbhYY before_build: + - ps: $env:UNITTEST_BASEFOLDER = "$Env:APPVEYOR_BUILD_FOLDER" + "\testdata" + - ps: if ($env:APPVEYOR_REPO_NAME.Equals("duplicati/duplicati")) { + $env:GITTER_NOTIFY_URL = "https://webhooks.gitter.im/e/a2c55bac2b5c38838e0f" + } - cmd: nuget restore Duplicati.sln build: project: Duplicati.sln @@ -19,9 +22,9 @@ test_script: 7z x DSMCBE.zip -otestdata mkdir .\testData\data - nuget install OpenCover -Version 4.6.166 -OutputDirectory packages - nuget install coveralls.net -Version 0.6.0 -OutputDirectory packages - nuget install NUnit.Runners -Version 3.4.0 -OutputDirectory packages + nuget install OpenCover -Version 4.7.922 -OutputDirectory packages + nuget install coveralls.net -Version 0.7.0 -OutputDirectory packages + nuget install NUnit.Runners -Version 3.10.0 -OutputDirectory packages $testDir = ".\Duplicati\UnitTest\bin\Debug" $tests = @("$testDir\Duplicati.UnitTest.dll") @@ -30,10 +33,10 @@ test_script: foreach ($elem in $tests) { $testResultsFile = "$elem" + ".xml" - .\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe ` + .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe ` -register:user ` - -target:.\packages\NUnit.ConsoleRunner.3.4.0\tools\nunit3-console.exe ` - "-targetargs:""$elem"" /framework:net-4.5 /where:cat!=BulkData /result:""$testResultsFile""" ` + -target:.\packages\NUnit.ConsoleRunner.3.10.0\tools\nunit3-console.exe ` + "-targetargs:""$elem"" /where:cat!=BulkData /result:""$testResultsFile""" ` "-filter:+[Duplicati.Library.Main]* -[UnitTest]*" ` -output:opencover.xml ` -returntargetcode ` @@ -54,7 +57,7 @@ test_script: $commitEmail = git show --quiet --format="%aE" $revision $commitMessage = git show --quiet --format="%s" $revision - .\packages\coveralls.net.0.6.0\tools\csmacnz.Coveralls.exe ` + .\packages\coveralls.net.0.7.0\tools\csmacnz.Coveralls.exe ` --opencover -i opencover.xml ` --repoToken "$Env:COVERALLS_REPO_TOKEN" ` --commitId "$revision" ` @@ -71,7 +74,7 @@ test_script: } notifications: - provider: Webhook - url: https://webhooks.gitter.im/e/a2c55bac2b5c38838e0f + url: $Env:GITTER_NOTIFY_URL method: POST on_build_success: true on_build_failure: true diff --git a/.travis.yml b/.travis.yml index 35fbb4918..1fffae46a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ solution: Duplicati.sln dotnet: 2.0.0 install: - nuget restore Duplicati.sln - - nuget install NUnit.Runners -Version 3.5.0 -OutputDirectory testrunner + - nuget install NUnit.Runners -Version 3.10.0 -OutputDirectory testrunner + - sudo pip install --upgrade pip - sudo pip install selenium - sudo pip install --upgrade urllib3 - - if [ ! -d "${TRAVIS_BUILD_DIR}"/packages/SharpCompress.0.23.0 ]; then ln -s "${TRAVIS_BUILD_DIR}"/packages/sharpcompress.0.23.0 "${TRAVIS_BUILD_DIR}"/packages/SharpCompress.0.18.2; fi + - if [ ! -d "${TRAVIS_BUILD_DIR}"/packages/SharpCompress.0.23.0 ]; then ln -s "${TRAVIS_BUILD_DIR}"/packages/sharpcompress.0.23.0 "${TRAVIS_BUILD_DIR}"/packages/SharpCompress.0.23.0; fi addons: coverity_scan: project: @@ -19,6 +20,8 @@ addons: branch_pattern: coverity_scan env: global: + - DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + - DOTNET_CLI_TELEMETRY_OPTOUT=1 # stop telemetry # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # via the "travis encrypt" command using the project repo's public key - secure: "ijaQDcVcMo/utuP514FiDZVGR5LJbATWmYDmgRIIaI0YG2Rk6uuJp9XXDXr8sx66JWttPGgs7Htqfy50VKHdr7nsfyCQCRNGmqF+OJeUgAQMj5spxn9A7PZY9+GVhnXoJ06wvYjCv5MPeLBMDK/KpIM5Ny5IG+TKzQy4U7Dyg0riMUT61aqzxSjTGfHZPmaqBICJTzsRmeGHglemFUz/1B4NAN+IeAtXoH9YIfA2LjJfYmMLckPgFQLKN/tQRaGPWXh77y0qVgA++K8UVu5W3yGo3JXBPDdabGgKs9BPlfN5/Ixnkcy6ekAubDA/Aspur9x7/szj4/AnGMY6frNB33nQcnJQZ/51GYKr6CXCmjoJQuWc8ZKdEMqDn3w/kyEzvluSjAsJNRVboeWPE4VfpAeUBsjQ+TuEQi8WXhN8VJgZV7yCkVlZTVbhtOxMPsBiFb74lpWC2iQuWLJv9ED6vyXZVzZhNtfjXNXNZzIwYxbcd7I0ZQ8fmDstFnvBJveJby2ZRpECXTbc03eIUq1SAaVJJY2r47RD1PwVqM3xvUTljIqtKdyIz915mEOjqG1BnCDaiGHYJ4byuDDeIUZO9X70s60Gh4hupZA2Ruup0v7SfYgkto6aNcStd0NYd716Vd7hqXNTp6nu01L5YYJDY4h5sHyBXVXbxCKlUb01kUw=" @@ -69,7 +72,8 @@ jobs: access_key: $SAUCE_ACCESS_KEY before_install: - - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- + - chmod +x ./build.sh # make the script executable if it already is not + - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- script: - ./build.sh ${CATEGORY} ${TRAVIS_BUILD_DIR} diff --git a/build.sh b/build.sh index 7f4610b83..3bfb919e9 100755 --- a/build.sh +++ b/build.sh @@ -76,7 +76,7 @@ echo "travis_fold:end:download_extract_testdata" # run unit tests echo "travis_fold:start:unit_test" if [[ "$CATEGORY" != "GUI" && "$CATEGORY" != "" ]]; then - mono ./testrunner/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe \ + mono ./testrunner/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe \ ./Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==$CATEGORY --workers=1 fi echo "travis_fold:end:unit_test"