Skip to content

Commit

Permalink
Merge pull request #70 from yim-lee/ci-5.10
Browse files Browse the repository at this point in the history
  • Loading branch information
ktoso committed Jun 13, 2024
2 parents 80746bd + adc9318 commit 525d450
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools
# ruby and jazzy for docs generation
RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev build-essential
# jazzy no longer works on older version of ubuntu as ruby is too old.
RUN if [ "${ubuntu_version}" = "focal" ] ; then echo "gem: --no-document" > ~/.gemrc ; fi
RUN if [ "${ubuntu_version}" = "focal" ] ; then gem install jazzy ; fi
RUN if [ "${ubuntu_version}" = "jammy" ] ; then echo "gem: --no-document" > ~/.gemrc ; fi
RUN if [ "${ubuntu_version}" = "jammy" ] ; then gem install jazzy ; fi

# tools
RUN mkdir -p $HOME/.tools
Expand Down
17 changes: 17 additions & 0 deletions docker/docker-compose.2204.510.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: "3"

services:

runtime-setup:
image: swift-linux-backtrace:22.04-5.10
build:
args:
base_image: "swiftlang/swift:nightly-5.10-jammy"

test:
image: swift-linux-backtrace:22.04-5.10
environment:
- FORCE_TEST_DISCOVERY=--enable-test-discovery

shell:
image: swift-linux-backtrace:22.04-5.10
3 changes: 2 additions & 1 deletion docker/docker-compose.2204.59.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ services:
image: swift-linux-backtrace:22.04-5.9
build:
args:
base_image: "swiftlang/swift:nightly-5.9-jammy"
ubuntu_version: "jammy"
swift_version: "5.9"

test:
image: swift-linux-backtrace:22.04-5.9
Expand Down

0 comments on commit 525d450

Please sign in to comment.