Skip to content

Commit

Permalink
🐋 Switch to Codeship
Browse files Browse the repository at this point in the history
  • Loading branch information
Theo Weidmann committed Mar 25, 2017
1 parent 8ba77ce commit 7137563
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.git
LICENSE
README.md
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

12 changes: 12 additions & 0 deletions DockerfileClang
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:16.10

RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y ninja-build python3 clang-3.9 cmake

RUN mkdir /app
WORKDIR /app

COPY . ./

ENV CC clang-3.9
ENV CXX clang++-3.9
ENV PYTHONIOENCODING utf8
12 changes: 12 additions & 0 deletions DockerfileGCC
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:16.10

RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y ninja-build python3 gcc g++ cmake

RUN mkdir /app
WORKDIR /app

COPY . ./

ENV CC gcc
ENV CXX g++
ENV PYTHONIOENCODING utf8
10 changes: 10 additions & 0 deletions codeship-services.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
clang_test:
build:
image: emojicode
dockerfile: DockerfileClang
cached: true
gcc_test:
build:
image: emojicodegcc
dockerfile: DockerfileGCC
cached: true
7 changes: 7 additions & 0 deletions codeship-steps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: parallel
name: test
services:
- gcc_test
- clang_test
steps:
- command: bash -c "cmake . -GNinja && ninja && ninja tests"
2 changes: 1 addition & 1 deletion tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def compilation_test(name):
completed = run([emojicode, binary_path], stdout=PIPE)
exp_path = os.path.join(dist.source, "tests", "compilation", name + ".txt")
output = completed.stdout.decode('utf-8')
if output != open(exp_path, "r").read():
if output != open(exp_path, "r", encoding='utf-8').read():
print(output)
fail_test(name)

Expand Down

0 comments on commit 7137563

Please sign in to comment.