Skip to content

Commit b4f63f2

Browse files
authored
Update CI and fix jazzy (#13)
1 parent 7bb0851 commit b4f63f2

File tree

4 files changed

+58
-2
lines changed

4 files changed

+58
-2
lines changed

docker/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ RUN apt-get update && apt-get install -y wget
1717
RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
1818

1919
# ruby and jazzy for docs generation
20-
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev
21-
RUN gem install jazzy --no-ri --no-rdoc
20+
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
21+
# jazzy no longer works on xenial as ruby is too old.
22+
RUN if [ "${ubuntu_version}" = "focal" ] ; then echo "gem: --no-document" > ~/.gemrc; fi
23+
RUN if [ "${ubuntu_version}" = "focal" ] ; then gem install jazzy; fi
2224

2325
# tools
2426
RUN mkdir -p $HOME/.tools

docker/docker-compose.2004.54.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-metrics:20.04-5.4
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.4"
11+
12+
test:
13+
image: swift-metrics:20.04-5.4
14+
environment: []
15+
#- SANITIZER_ARG=--sanitize=thread
16+
17+
shell:
18+
image: swift-metrics:20.04-5.4

docker/docker-compose.2004.55.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-metrics:20.04-5.5
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.5"
11+
12+
test:
13+
image: swift-metrics:20.04-5.5
14+
environment: []
15+
#- SANITIZER_ARG=--sanitize=thread
16+
17+
shell:
18+
image: swift-metrics:20.04-5.5

docker/docker-compose.2004.main.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-metrics:20.04-main
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-focal"
10+
11+
12+
test:
13+
image: swift-metrics:20.04-main
14+
environment: []
15+
#- SANITIZER_ARG=--sanitize=thread
16+
17+
shell:
18+
image: swift-metrics:20.04-main

0 commit comments

Comments
 (0)