Skip to content

Commit 2534098

Browse files
tomerdyim-lee
andauthored
ci update (#34)
* ci update motivation: 5.6 is out changes: * add setup for 5.5, 5.6 * add docker setup for 5.7 (using nightly for now) * add docker setup for main * fix jazzy too old Co-authored-by: Yim Lee <[email protected]>
1 parent f8233fb commit 2534098

File tree

5 files changed

+53
-4
lines changed

5 files changed

+53
-4
lines changed

docker/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools
1818

1919
# ruby and jazzy for docs generation
2020
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
21-
# switch of gem docs building
22-
RUN echo "gem: --no-document" > ~/.gemrc
23-
# jazzy no longer works on xenial as ruby is too old.
24-
RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy; fi
21+
# jazzy no longer works on older version of ubuntu 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
2524

2625
# tools
2726
RUN mkdir -p $HOME/.tools

docker/docker-compose.2004.55.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-statsd-client:20.04-5.5
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.5"
11+
12+
test:
13+
image: swift-statsd-client:20.04-5.5

docker/docker-compose.2004.56.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-statsd-client:20.04-5.6
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.6"
11+
12+
test:
13+
image: swift-statsd-client:20.04-5.6

docker/docker-compose.2004.57.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-statsd-client:20.04-5.7
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-focal"
10+
11+
test:
12+
image: swift-statsd-client:20.04-5.7

docker/docker-compose.2004.main.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-statsd-client:20.04-main
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-focal"
10+
11+
test:
12+
image: swift-statsd-client:20.04-main

0 commit comments

Comments
 (0)