Skip to content

Commit e20eff5

Browse files
committed
🔧 update ci config
1 parent b11bedd commit e20eff5

File tree

2 files changed

+34
-29
lines changed

2 files changed

+34
-29
lines changed

.travis.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
language: csharp
22
solution: EasyCaching.sln
3-
dist: xenial
3+
dist: bionic
44
sudo: required
55
dotnet: 3.0.100
66
mono: none
77

88
services:
9-
- memcached
10-
- redis-server
9+
- docker
1110

1211
os:
1312
- linux
@@ -21,7 +20,15 @@ branches:
2120
- dev
2221

2322
script:
23+
# osx do not support docker
24+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker pull redis; fi
25+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker pull memcached; fi
26+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker run -p 6379:6379 --name redis6379 -d redis:latest redis-server; fi
27+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker run -p 6380:6379 --name redis6380 -d redis:latest redis-server; fi
28+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker run -p 6388:6379 --name redis6388 -d redis:latest redis-server; fi
29+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker run -p 11211:11211 --name memcached1 -d memcached:latest memcached -m 64 -c 2048; fi
30+
# - if test "$TRAVIS_OS_NAME" == "linux"; then docker run -p 11212:11211 --name memcached2 -d memcached:latest memcached -m 64 -c 2048; fi
2431
- if test "$TRAVIS_OS_NAME" == "linux"; then dotnet restore; fi
25-
- if test "$TRAVIS_OS_NAME" == "osx"; then dotnet restore --disable-parallel; fi
32+
- if test "$TRAVIS_OS_NAME" == "osx"; then dotnet restore --disable-parallel; fi
2633
- dotnet build -c Release
27-
#- if test "$TRAVIS_OS_NAME" == "linux"; then dotnet test -c Release ./test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj; fi
34+
# - if test "$TRAVIS_OS_NAME" == "linux"; then dotnet test -c Release --no-build ./test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj; fi

appveyor.yml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,25 @@ for:
2626
- image: Visual Studio 2019
2727
clone_folder: C:\projects\easycaching\
2828

29-
install:
30-
- ps: cd c:\projects\easycaching\tools\RedisConfigs\3.0.503\
31-
- ps: .\redis-server.exe --service-install --service-name "redis-6379" "..\Basic\master-6379.conf"
32-
- ps: .\redis-server.exe --service-install --service-name "redis-6380" "..\Basic\master-6380.conf"
33-
- ps: .\redis-server.exe --service-install --service-name "redis-6388" "..\Basic\master-6388.conf"
34-
- ps: net start redis-6379
35-
- ps: net start redis-6380
36-
- ps: net start redis-6388
37-
- ps: new-service –Name memcached1 –DisplayName memcached1 –BinaryPathName “c:\projects\easycaching\tools\memcached\memcached.exe -d runservice -m 64 -c 2048 -p 11211” –StartupType Automatic
38-
- ps: new-service –Name memcached2 –DisplayName memcached2 –BinaryPathName “c:\projects\easycaching\tools\memcached\memcached.exe -d runservice -m 64 -c 2048 -p 11212” –StartupType Automatic
39-
- ps: net start memcached1
40-
- ps: net start memcached2
41-
- ps: cd c:\projects\easycaching
29+
services:
30+
- docker
4231

4332
before_build:
33+
- ps: docker pull redis
34+
- ps: docker pull bitnami/memcached:latest
35+
- ps: docker run -p 6379:6379 --name redis6379 -d redis:latest
36+
- ps: docker run -p 6380:6379 --name redis6380 -d redis:latest
37+
- ps: docker run -p 6388:6379 --name redis6388 -d redis:latest
38+
- ps: docker run -p 11211:11211 --name memcached1 -d bitnami/memcached:latest
39+
- ps: docker run -p 11212:11211 --name memcached2 -d bitnami/memcached:latest
40+
- ps: docker ps -a
4441
- ps: dotnet restore
4542

4643
build_script:
4744
- ps: dotnet build -c Release
4845

4946
test_script:
47+
- ps: docker ps -a
5048
- ps: dotnet test -c Release --no-build .\test\EasyCaching.UnitTests\EasyCaching.UnitTests.csproj
5149

5250
-
@@ -57,24 +55,24 @@ for:
5755
clone_folder: /home/appveyor/projects/easycaching
5856

5957
services:
60-
- redis
61-
62-
install:
63-
#- sh: sudo apt-get install libevent libevent-deve
64-
- sh: redis-server /home/appveyor/projects/easycaching/tools/RedisConfigs/Basic/master-6388.conf
65-
- sh: redis-server /home/appveyor/projects/easycaching/tools/RedisConfigs/Basic/master-6380.conf
66-
- sh: sudo apt-get update
67-
- sh: sudo apt-get install memcached
68-
- sh: sudo memcached -p 11211 -u root -m 64m -d
69-
- sh: sudo memcached -p 11212 -u root -m 64m -d
58+
- docker
7059

7160
before_build:
61+
- sh: docker pull redis
62+
- sh: docker pull memcached
63+
- sh: docker run -p 6379:6379 --name redis6379 -d redis:latest redis-server
64+
- sh: docker run -p 6380:6379 --name redis6380 -d redis:latest redis-server
65+
- sh: docker run -p 6388:6379 --name redis6388 -d redis:latest redis-server
66+
- sh: docker run -p 11211:11211 --name memcached1 -d memcached memcached -m 64 -c 2048
67+
- sh: docker run -p 11212:11211 --name memcached2 -d memcached memcached -m 64 -c 2048
68+
- sh: docker ps -a
7269
- sh: dotnet restore
7370

7471
build_script:
7572
- sh: dotnet build -c Release
7673

7774
test_script:
78-
- sh: dotnet test -c Release --no-build ./test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj
75+
- ps: docker ps -a
76+
- sh: dotnet test -c Release --no-build ./test/EasyCaching.UnitTests/EasyCaching.UnitTests.csproj
7977

8078

0 commit comments

Comments
 (0)