Skip to content

Commit f881e6c

Browse files
authored
Add 5.4, 5.5, and main CI (#12)
1 parent 4b5603c commit f881e6c

File tree

4 files changed

+64
-2
lines changed

4 files changed

+64
-2
lines changed

docker/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ 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
20+
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
21+
# switch off gem docs building
22+
RUN echo "gem: --no-document" > ~/.gemrc
2123
# jazzy no longer works on xenial as ruby is too old.
22-
RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy --no-ri --no-rdoc ; fi
24+
RUN if [ "${ubuntu_version}" != "xenial" ] ; then gem install jazzy; fi
2325

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

docker/docker-compose.2004.54.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-http-structured-headers:20.04-5.4
7+
build:
8+
args:
9+
ubuntu_version: "focal"
10+
swift_version: "5.4"
11+
12+
unit-tests:
13+
image: swift-http-structured-headers:20.04-5.4
14+
15+
test:
16+
image: swift-http-structured-headers:20.04-5.4
17+
18+
shell:
19+
image: swift-http-structured-headers:20.04-5.4
20+

docker/docker-compose.2004.55.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-http-structured-headers:20.04-5.5
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-5.5-focal"
10+
ubuntu_version: "focal"
11+
12+
unit-tests:
13+
image: swift-http-structured-headers:20.04-5.5
14+
15+
test:
16+
image: swift-http-structured-headers:20.04-5.5
17+
18+
shell:
19+
image: swift-http-structured-headers:20.04-5.5
20+

docker/docker-compose.2004.main.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: "3"
2+
3+
services:
4+
5+
runtime-setup:
6+
image: swift-http-structured-headers:20.04-main
7+
build:
8+
args:
9+
base_image: "swiftlang/swift:nightly-main-focal"
10+
ubuntu_version: "focal"
11+
12+
unit-tests:
13+
image: swift-http-structured-headers:20.04-main
14+
15+
test:
16+
image: swift-http-structured-headers:20.04-main
17+
18+
shell:
19+
image: swift-http-structured-headers:20.04-main
20+

0 commit comments

Comments
 (0)