Skip to content

Commit c0e384c

Browse files
committed
Updates Dockerfiles and adds CI on 8.10
1 parent 2d7dadd commit c0e384c

File tree

3 files changed

+51
-8
lines changed

3 files changed

+51
-8
lines changed

.gitlab-ci.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ stages:
1717
- '.hspec-failures'
1818

1919
.header-ghc-84: &header-ghc-84
20-
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.4:0.6.0.0-p3
21-
allow_failure: true
20+
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.4:0.6.0.0-p4
2221
variables:
2322
STACK_YAML: "stack-804.yaml"
2423
GHC: 804
@@ -27,7 +26,7 @@ stages:
2726
<<: *cached-dirs
2827

2928
.header-ghc-86: &header-ghc-86
30-
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.6:0.6.0.0-p2
29+
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.6:0.6.0.0-p3
3130
variables:
3231
STACK_YAML: "stack-806.yaml"
3332
GHC: 806
@@ -36,14 +35,23 @@ stages:
3635
<<: *cached-dirs
3736

3837
.header-ghc-88: &header-ghc-88
39-
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.8:0.6.0.0-p2
38+
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.8:0.6.0.0-p3
4039
variables:
4140
STACK_YAML: "stack-808.yaml"
4241
GHC: 808
4342
cache:
4443
key: "${CI_COMMIT_REF_SLUG}-ghc-8.8"
4544
<<: *cached-dirs
4645

46+
.header-ghc-88: &header-ghc-810
47+
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.10:0.6.0.0
48+
variables:
49+
STACK_YAML: "stack-810.yaml"
50+
GHC: 810
51+
cache:
52+
key: "${CI_COMMIT_REF_SLUG}-ghc-8.8"
53+
<<: *cached-dirs
54+
4755
before_script:
4856
- echo $CI_PROJECT_DIR
4957
- export PATH="$HOME/.local/bin:$PATH"
@@ -75,6 +83,10 @@ build:ghc-8.8:
7583
<<: *header-ghc-88
7684
<<: *build-script
7785

86+
build:ghc-8.10:
87+
<<: *header-ghc-810
88+
<<: *build-script
89+
7890
test:ghc-8.4:
7991
dependencies:
8092
- build:ghc-8.4
@@ -94,16 +106,22 @@ test:ghc-8.8:
94106
<<: *header-ghc-88
95107
<<: *test-script
96108

109+
test:ghc-8.10:
110+
dependencies:
111+
- build:ghc-8.10
112+
<<: *header-ghc-810
113+
<<: *test-script
114+
97115
deploy_documents:
98116
only:
99117
- master@konn/computational-algebra
100-
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.6:0.6.0.0-p2
118+
image: registry.gitlab.com/konn/computational-algebra/build/ghc-8.8:0.6.0.0-p3
101119
stage: deploy
102120
allow_failure: true
103121
dependencies:
104-
- test:ghc-8.6
122+
- test:ghc-8.8
105123
cache:
106-
key: "${CI_COMMIT_REF_SLUG}-ghc-8.6"
124+
key: "${CI_COMMIT_REF_SLUG}-ghc-8.8"
107125
policy: pull
108126
<<: *cached-dirs
109127
script:

dockerfiles/build/ghc-8.10/Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM registry.gitlab.com/konn/computational-algebra/build-pre:0.6.0.0
2+
3+
RUN mkdir /skeleton
4+
COPY computational-algebra/ /skeleton/computational-algebra
5+
COPY algebraic-prelude/ /skeleton/algebraic-prelude
6+
COPY halg-algebraic/ /skeleton/halg-algebraic
7+
COPY halg-algorithms/ /skeleton/halg-algorithms
8+
COPY halg-bridge-singular/ /skeleton/halg-bridge-singular
9+
COPY halg-core/ /skeleton/halg-core
10+
COPY halg-core-test/ /skeleton/halg-core-test
11+
COPY halg-factor/ /skeleton/halg-factor
12+
COPY halg-galois-fields/ /skeleton/halg-galois-fields
13+
COPY halg-heaps/ /skeleton/halg-heaps
14+
COPY halg-matrices/ /skeleton/halg-matrices
15+
COPY halg-polyn-parser/ /skeleton/halg-polyn-parser
16+
COPY halg-polynomials/ /skeleton/halg-polynomials
17+
18+
ENV GHC=810
19+
COPY stack-${GHC}.yaml /skeleton
20+
21+
WORKDIR /skeleton
22+
ENV STACK_YAML=stack-${GHC}.yaml
23+
RUN stack setup
24+
RUN stack build --only-dependencies --test --no-run-tests

dockerfiles/build/ghc-8.4/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ RUN stack build --only-dependencies --test --no-run-tests
2626
ENV GHC_LLVM_LLC_PATH=llc-5.0
2727
ENV GHC_LLVM_OPT_PATH=opt-5.0
2828

29-
RUN echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" >> /etc/apt/sources.list && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && apt-get update && apt-get -y install clang-5.0 lld-5.0
29+
RUN LLR=$LD_LIBRARY_PATH && unset LD_LIBRARY_PATH && echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" >> /etc/apt/sources.list && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && apt-get update && apt-get -y install clang-5.0 lld-5.0 && export LD_LIBRARY_PATH=$LLR
30+

0 commit comments

Comments
 (0)