Skip to content

Commit 1e2fa84

Browse files
authored
add 5.4 and nightly ci jobs (#82)
motivation: prepare for 5.4 and test against nightlies changes: * add docker compose setup for 5.4 and nightly testing
1 parent 19e0ab6 commit 1e2fa84

File tree

3 files changed

+38
-2
lines changed

3 files changed

+38
-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 if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy --no-ri --no-rdoc ; fi
20+
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+
RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy ; fi
2224

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

docker/docker-compose.2004.54.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-service-lifecycle:20.04-5.4
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-5.4-focal"
10+
11+
test:
12+
image: swift-service-lifecycle:20.04-5.4
13+
environment:
14+
- SKIP_SIGNAL_TEST=true
15+
16+
shell:
17+
image: swift-service-lifecycle:20.04-5.4

docker/docker-compose.2004.main.yaml

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

0 commit comments

Comments
 (0)