Skip to content

update ci setup #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# file options

--swiftversion 5.0
--exclude .build

# format options

--self insert
--patternlet inline
--stripunusedargs unnamed-only
--comments ignore
--ranges nospace

# rules
5 changes: 3 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ARG swift_version=5.0
ARG ubuntu_version=bionic
FROM swift:$swift_version-$ubuntu_version
ARG base_image=swift:$swift_version-$ubuntu_version
FROM $base_image
# needed to do again after FROM due to docker limitation
ARG swift_version
ARG ubuntu_version
Expand Down Expand Up @@ -29,7 +30,7 @@ RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal

# swiftformat (until part of the toolchain)

ARG swiftformat_version=0.40.12
ARG swiftformat_version=0.44.6
RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
RUN cd $HOME/.tools/swift-format && swift build -c release
RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat
2 changes: 1 addition & 1 deletion docker/docker-compose.1604.51.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
build:
args:
ubuntu_version: "xenial"
swift_version: "5.1.3"
swift_version: "5.1"

test:
image: async-http-client:16.04-5.1
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.1804.51.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
build:
args:
ubuntu_version: "bionic"
swift_version: "5.1.3"
swift_version: "5.1"

test:
image: async-http-client:18.04-5.1
Expand Down
18 changes: 18 additions & 0 deletions docker/docker-compose.1804.52.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: "3"

services:

runtime-setup:
image: async-http-client:18.04-5.2
build:
args:
ubuntu_version: "bionic"
swift_version: "5.2"

test:
image: async-http-client:18.04-5.2
environment: []
#- SANITIZER_ARG=--sanitize=thread
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is sanitizer disabled?

Copy link
Contributor Author

@tomerd tomerd Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tsan issue on 18.04, we have it enabled on 16.04 which is what the ci uses


shell:
image: async-http-client:18.04-5.2
17 changes: 17 additions & 0 deletions docker/docker-compose.1804.53.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: "3"

services:

runtime-setup:
image: async-http-client:18.04-5.3
build:
args:
base_image: "swiftlang/swift:nightly-master-bionic"

test:
image: async-http-client:18.04-5.3
environment: []
#- SANITIZER_ARG=--sanitize=thread

shell:
image: async-http-client:18.04-5.3