Skip to content

Commit 82879dd

Browse files
committed
Add gitlab
1 parent 4c9d091 commit 82879dd

File tree

6 files changed

+48
-11
lines changed

6 files changed

+48
-11
lines changed

.gitlab-ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
image: f799/learning:latest
2+
stages:
3+
- build
4+
- test
5+
job1:
6+
stage: build
7+
script:
8+
- dotnet --version
9+
- dotnet --info
10+
- dotnet restore
11+
- pwd
12+
- ls -sl
13+
- cd test/LearningCSharp.Test
14+
- dotnet build
15+
- cd src/LearningCSharp.Service
16+
- dotnet build
17+
only:
18+
- master
19+
tags:
20+
- docker
21+
22+
job2:
23+
stage: test
24+
script:
25+
- cd test/LearningCSharp.Test
26+
- dotnet restore
27+
- dotnet build
28+
- dotnet test
29+
only:
30+
- master
31+
tags:
32+
- docker

Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN apt-get -y install curl
5959
#RUN mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
6060
## https://github.com/dotnet/core/blob/master/release-notes/download-archive.md
6161
RUN sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
62-
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B02C46DF417A0893
62+
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
6363
RUN apt-get update
6464
RUN apt-get -y install dotnet-dev-1.0.4
6565

@@ -79,5 +79,10 @@ RUN sh -c 'echo "deb http://download.mono-project.com/repo/debian wheezy/snapsho
7979
RUN apt-get update
8080
RUN apt-get -y install mono-complete
8181
RUN apt-get -y install mono-devel referenceassemblies-pcl
82+
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
83+
RUN sh -c 'echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/4.6.0.245 main" > /etc/apt/sources.list.d/mono-xamarin.list'
84+
RUN apt-get update
85+
RUN apt-get -y install mono-complete
86+
RUN apt-get -y install mono-devel referenceassemblies-pcl
8287
RUN apt-get -y install curl
83-
ENV DEBIAN_FRONTEND teletype
88+
ENV DEBIAN_FRONTEND teletype

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
[![Join the chat at https://gitter.im/f7q/learning](https://badges.gitter.im/f7q/learning.svg)](https://gitter.im/f7q/learning?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
44
learning Github
55

6-
|Circle CI|MyGet CI|Travis CI|Appveyor CI|
7-
|:-------:|:------:|:------:|:------:|
8-
|[![Circle CI](https://circleci.com/gh/f7q/learning.svg?style=svg)](https://circleci.com/gh/f7q/learning)|[![learning MyGet Build Status](https://www.myget.org/BuildSource/Badge/learning?identifier=51208b8b-a669-446a-9ce5-c271dda9d59c)](https://www.myget.org/)|[![Build Status](https://travis-ci.org/f7q/learning.svg?branch=master)](https://travis-ci.org/f7q/learning)|[![Build status](https://ci.appveyor.com/api/projects/status/2a8ootborxq0689u?svg=true)](https://ci.appveyor.com/project/f7q/learning)|
6+
|Circle CI|MyGet CI|Travis CI|Appveyor CI|GitLab CI|
7+
|:-------:|:------:|:-------:|:---------:|:-------:|
8+
|[![Circle CI](https://circleci.com/gh/f7q/learning.svg?style=svg)](https://circleci.com/gh/f7q/learning)|[![learning MyGet Build Status](https://www.myget.org/BuildSource/Badge/learning?identifier=51208b8b-a669-446a-9ce5-c271dda9d59c)](https://www.myget.org/)|[![Build Status](https://travis-ci.org/f7q/learning.svg?branch=master)](https://travis-ci.org/f7q/learning)|[![Build status](https://ci.appveyor.com/api/projects/status/2a8ootborxq0689u?svg=true)](https://ci.appveyor.com/project/f7q/learning)|[![build status](https://gitlab.com/f7Q/learning1/badges/master/build.svg)](https://gitlab.com/f7Q/learning1/commits/master)|
99

1010
- C#
1111
- dotnet Core

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 1.0.{build}
22
branches:
33
only:
4-
- UpdateSDK
4+
- master
55
build_script:
66
- ps: .\build.ps1
77
test: off

src/LearningCSharp.Service/LearningCSharp.Service.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>LearningCSharp.Service</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>LearningCSharp.Service</PackageId>
9-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
9+
<RuntimeFrameworkVersion>1.0.5</RuntimeFrameworkVersion>
1010
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
1111
</PropertyGroup>
1212

@@ -17,9 +17,9 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
21-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
22-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
20+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.4" />
21+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.3" />
22+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.4" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.0.2" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />

test/LearningCSharp.Test/LearningCSharp.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageId>LearningCSharp.Test</PackageId>
88
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
99
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net451+win8</PackageTargetFallback>
10-
<RuntimeFrameworkVersion>1.0.1</RuntimeFrameworkVersion>
10+
<RuntimeFrameworkVersion>1.0.5</RuntimeFrameworkVersion>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)