File tree Expand file tree Collapse file tree 4 files changed +9
-45
lines changed Expand file tree Collapse file tree 4 files changed +9
-45
lines changed Original file line number Diff line number Diff line change @@ -3,24 +3,20 @@ matrix:
3
3
- os : linux # Ubuntu 14.04
4
4
dist : trusty
5
5
sudo : required
6
- - os : linux # Ubuntu 14.04
7
- dist : trusty
8
- env : BUILD_DOCKER=true
9
6
- os : osx # OSX 10.12
10
7
osx_image : xcode8.3
11
8
12
9
before_install :
13
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_DOCKER" != true ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
10
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
14
11
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./scripts/mac-prereqs.sh ; fi
15
12
16
13
install :
17
- - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/dotnet-install.sh ; fi
18
- - if [[ "$BUILD_DOCKER" != true ]]; then PATH=$PATH:$HOME/.dotnet && export PATH ; fi
14
+ - ./scripts/dotnet-install.sh
15
+ - PATH=$PATH:$HOME/.dotnet && export PATH
19
16
- if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then docker-compose -f docker-compose.yml up -d ; fi
20
17
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then tarantool tarantool/tarantool.lua ; fi
21
18
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then redis-server --daemonize yes ; fi
22
19
23
20
script :
24
- - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/build-netcore.sh ; fi
25
- - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/test-netcore.sh ; fi
26
- - if [[ "$BUILD_DOCKER" == true ]]; then docker-compose -f docker-compose.yml -f docker-compose.tests.yml up --build tarantool-client ; fi
21
+ - ./scripts/build-netcore.sh
22
+ - ./scripts/test-netcore.sh
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 8
8
9
9
dotnet restore
10
10
dotnet build -c Release -f netstandard1.4 src/progaudi.tarantool/progaudi.tarantool.csproj
11
+ dotnet build -c Release -f netstandard2.0 src/progaudi.tarantool/progaudi.tarantool.csproj
11
12
dotnet build -c Release -f netcoreapp1.0 tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
12
13
dotnet build -c Release -f netcoreapp1.1 tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
14
+ dotnet build -c Release -f netcoreapp2.0 tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
13
15
14
16
popd
Original file line number Diff line number Diff line change 4
4
5
5
curl -o ./dotnet-install.sh -fL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh
6
6
chmod +x ./dotnet-install.sh
7
- version= $( jq -r .sdk. version global.json )
8
- ./dotnet-install.sh --version $version
7
+ ./dotnet-install.sh -- version 1.0.4
8
+ ./dotnet-install.sh --version 2.0.0
You can’t perform that action at this time.
0 commit comments