File tree Expand file tree Collapse file tree 3 files changed +16
-24
lines changed Expand file tree Collapse file tree 3 files changed +16
-24
lines changed Original file line number Diff line number Diff line change 9
9
10
10
matrix :
11
11
include :
12
- - env : TEST_ENV=ubuntu-16 .04-llvm-dev
13
- - env : TEST_ENV=ubuntu-16 .04-llvm-6.0
14
- - env : TEST_ENV=ubuntu-16 .04-llvm-5.0
12
+ - env : TEST_ENV=ubuntu-18 .04-llvm-dev
13
+ - env : TEST_ENV=ubuntu-18 .04-llvm-6.0
14
+ - env : TEST_ENV=ubuntu-18 .04-llvm-5.0
Original file line number Diff line number Diff line change 1
- ARG UBUNTU_VERSION=16 .04
1
+ ARG UBUNTU_VERSION=18 .04
2
2
FROM ubuntu:$UBUNTU_VERSION
3
3
4
4
RUN set -x \
5
5
&& apt update \
6
- && apt install -y apt-transport-https \
6
+ && apt install -y apt-transport-https gnupg2 ca-certificates \
7
7
&& echo "deb https://dl.bintray.com/sbt/debian /" > /etc/apt/sources.list.d/sbt.list \
8
8
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 \
9
9
&& apt update \
10
- && apt install -y curl build-essential openjdk-8-jdk-headless sbt \
10
+ && apt install -y curl build-essential openjdk-8-jdk-headless sbt cmake make \
11
11
&& rm -rf /var/lib/apt/lists/*
12
12
13
- WORKDIR /cmake
14
- ARG CMAKE_ARCHIVE=cmake-3.11.2-Linux-x86_64
15
- RUN curl https://cmake.org/files/v3.11/$CMAKE_ARCHIVE.tar.gz | tar zxf - \
16
- && for i in bin share; do \
17
- cp -r /cmake/$CMAKE_ARCHIVE/$i/* /usr/$i/; \
18
- done \
19
- && rm -rf /cmake
20
-
21
13
ARG LLVM_VERSION=6.0
22
14
# LLVM dev versions do not have a "-x.y" version suffix.
23
15
ARG LLVM_DEB_COMPONENT=-$LLVM_VERSION
@@ -26,7 +18,7 @@ RUN set -x \
26
18
&& . /etc/lsb-release \
27
19
&& echo "deb https://apt.llvm.org/$DISTRIB_CODENAME/ llvm-toolchain-$DISTRIB_CODENAME$LLVM_DEB_COMPONENT main" > /etc/apt/sources.list.d/llvm.list \
28
20
&& apt update \
29
- && apt install -y clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev make \
21
+ && apt install -y clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev \
30
22
&& rm -rf /var/lib/apt/lists/*
31
23
32
24
WORKDIR /src/target
Original file line number Diff line number Diff line change 1
1
version : ' 3'
2
2
3
3
services :
4
- ubuntu-16 .04-llvm-dev :
5
- image : scala-native-bindgen:ubuntu-16 .04-llvm-dev
4
+ ubuntu-18 .04-llvm-dev :
5
+ image : scala-native-bindgen:ubuntu-18 .04-llvm-dev
6
6
build :
7
7
context : .
8
8
args :
9
- - UBUNTU_VERSION=16 .04
9
+ - UBUNTU_VERSION=18 .04
10
10
- LLVM_VERSION=7
11
11
- LLVM_DEB_COMPONENT=
12
12
13
- ubuntu-16 .04-llvm-6.0 :
14
- image : scala-native-bindgen:ubuntu-16 .04-llvm-6.0
13
+ ubuntu-18 .04-llvm-6.0 :
14
+ image : scala-native-bindgen:ubuntu-18 .04-llvm-6.0
15
15
build :
16
16
context : .
17
17
args :
18
- - UBUNTU_VERSION=16 .04
18
+ - UBUNTU_VERSION=18 .04
19
19
- LLVM_VERSION=6.0
20
20
21
- ubuntu-16 .04-llvm-5.0 :
22
- image : scala-native-bindgen:ubuntu-16 .04-llvm-5.0
21
+ ubuntu-18 .04-llvm-5.0 :
22
+ image : scala-native-bindgen:ubuntu-18 .04-llvm-5.0
23
23
build :
24
24
context : .
25
25
args :
26
- - UBUNTU_VERSION=16 .04
26
+ - UBUNTU_VERSION=18 .04
27
27
- LLVM_VERSION=5.0
28
28
29
29
sbt-test :
You can’t perform that action at this time.
0 commit comments