Browse Source

Line endings fixed

pull/1/head
Sebastian 9 years ago
parent
commit
51efb12be2
  1. 3
      .gitattributes
  2. 4
      build.docker-compose.yml
  3. 2
      build.sh

3
.gitattributes

@ -62,4 +62,5 @@
#*.rtf diff=astextplain #*.rtf diff=astextplain
#*.RTF diff=astextplain #*.RTF diff=astextplain
.sh text eol=lf .sh text eol=lf
.yml text eol=lf

4
build.docker-compose.yml

@ -1,8 +1,10 @@
version: '2' version: '2'
services: services:
build: squidex-build:
# Use custom aspnet images where phantomjs is installed
image: sebastianstehle/aspnetcore-build:1.1.0-projectjson-phantomjs image: sebastianstehle/aspnetcore-build:1.1.0-projectjson-phantomjs
volumes: volumes:
- .:/sln - .:/sln
working_dir: /sln working_dir: /sln
# Run the build script on local folder
entrypoint: ["sh", "./build.sh"] entrypoint: ["sh", "./build.sh"]

2
build.sh

@ -7,7 +7,7 @@ npm rebuild phantomjs-prebuilt
npm run test:coverage npm run test:coverage
npm run build:copy npm run build:copy
npm run build npm run build
cd ../.. cd ./../..
dotnet restore dotnet restore
dotnet test tests/Squidex.Core.Tests/project.json dotnet test tests/Squidex.Core.Tests/project.json
dotnet test tests/Squidex.Infrastructure.Tests/project.json dotnet test tests/Squidex.Infrastructure.Tests/project.json

Loading…
Cancel
Save