Skip to content

Commit

Permalink
Use the machine executor
Browse files Browse the repository at this point in the history
Use the machine executor (https://circleci.com/docs/2.0/executor-types/#using-machine) which gives us 8GB of RAM and avoid the issues with the Linux Docker image
* Add a Dockerfile and the .dockerignore with all the details to run Docker with Swift 5.0 in Linux
* Update the CHANGELOG
  • Loading branch information
Vkt0r committed Jul 3, 2019
1 parent f043c24 commit 7ae2427
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,15 @@ jobs:
path: /tmp/test-results

Test Linux Platform:
docker:
- image: swift:5.0
machine: true
steps:
- checkout
- run:
name: Build Docker Image
command: docker build --tag swift5.0 .
- run:
name: Run Docker Container
command: docker run --rm swift5.0
- run:
name: Run Unit Tests
command: swift test
Expand Down
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.git/
.build/
!.build/checkouts/
!.build/repositories/
!.build/workspace-state.json
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ All notable changes to this project will be documented in this file. Changes not

- Add the `trailing_whitespace` rule in Swiftlint and autocorrect all the source files. ([#416](https://github.com/httpswift/swifter/pull/416)) by [@Vkt0r](https://github.com/Vkt0r)

## Changed

- Use the machine executor (https://circleci.com/docs/2.0/executor-types/#using-machine) which gives us 8GB of RAM and avoid the issues with the Linux Docker image. ([#422](https://github.com/httpswift/swifter/pull/422)) by [@Vkt0r](https://github.com/Vkt0r)

# [1.4.7]

## Added
Expand Down
9 changes: 9 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM swift:5.0

WORKDIR /package

COPY . ./

RUN swift package resolve
RUN swift package clean
CMD swift test

0 comments on commit 7ae2427

Please sign in to comment.