Skip to content

Commit b2f2c26

Browse files
committed
Attempt to fix Travis build by blindly importing the scripts and config from serilog/serilog
1 parent 937cdfe commit b2f2c26

File tree

2 files changed

+14
-53
lines changed

2 files changed

+14
-53
lines changed

.travis.yml

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,11 @@
11
language: csharp
22

3-
#dotnet cli require Ubuntu 14.04
4-
sudo: required
5-
dist: trusty
6-
7-
#dotnet cli require OSX 10.10
8-
osx_image: xcode7.1
9-
10-
addons:
11-
apt:
12-
packages:
13-
- gettext
14-
- libcurl4-openssl-dev
15-
- libicu-dev
16-
- libssl-dev
17-
- libunwind8
18-
- zlib1g
19-
20-
os:
21-
- linux
22-
23-
env:
24-
global:
25-
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
26-
- TMP: /tmp
27-
28-
matrix:
29-
- CLI_VERSION=1.0.0-preview2-003121
30-
- CLI_VERSION=Latest
31-
323
matrix:
33-
allow_failures:
34-
- env: CLI_VERSION=Latest
35-
36-
before_install:
37-
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; brew link --force openssl; fi
38-
# Download script to install dotnet cli
39-
- if test "$CLI_OBTAIN_URL" == ""; then export CLI_OBTAIN_URL="https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.sh"; fi
40-
- curl -L --create-dirs $CLI_OBTAIN_URL -o ./scripts/obtain/install.sh
41-
- find ./scripts -name "*.sh" -exec chmod +x {} \;
42-
- export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
43-
# use bash to workaround bug https://github.com/dotnet/cli/issues/1725
44-
- sudo bash ./scripts/obtain/install.sh --channel "preview" --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path
45-
# add dotnet to PATH
46-
- export PATH="$DOTNET_INSTALL_DIR:$PATH"
47-
4+
include:
5+
- os: linux
6+
dist: trusty
7+
sudo: required
8+
dotnet: 1.0.4
9+
group: edge
4810
script:
49-
- ./build.sh
11+
- ./build.sh

build.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/bash
2-
dotnet restore --no-cache
3-
for path in src/*/project.json; do
4-
dirname="$(dirname "${path}")"
5-
dotnet build ${dirname} -f netstandard1.3 -c Release
2+
dotnet --info
3+
dotnet restore
4+
5+
for path in src/**/*.csproj; do
6+
dotnet build -f netstandard1.3 -c Release ${path}
67
done
78

8-
for path in test/*.Tests/project.json; do
9-
dirname="$(dirname "${path}")"
10-
dotnet build ${dirname} -f netcoreapp1.0 -c Release
11-
dotnet test ${dirname} -f netcoreapp1.0 -c Release
9+
for path in test/*.Tests/*.csproj; do
10+
dotnet test -f netcoreapp1.0 -c Release ${path}
1211
done

0 commit comments

Comments
 (0)