Skip to content

Commit

Permalink
Fix the dependency to the version based (#102)
Browse files Browse the repository at this point in the history
* Fix the dependency to the version based

Change the dependency of Swift-Kuery to the version based dependency.
This will make the integration of Swifty-Kuery-PostgreSQL from multiple packages easier and avoid the error message type like this one:
`error: because package swift-kuery-postgresql is required using a version-based requirement and it depends on unversion package swift-kuery and no versions of Swift-Kuery-PostgreSQL match the requirement 2.1.201..<3.0.0, Swift-Kuery-PostgreSQL >=2.1.200 is forbidden.`

* Update Docker images for Travis.

* Remove unsupported architectures.
Remove parallel flags.
  • Loading branch information
mbarnach authored Apr 22, 2021
1 parent 7e58740 commit 08db787
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
31 changes: 18 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,36 @@ branches:

matrix:
include:
# - os: linux
# dist: xenial
# sudo: required
# services: docker
# env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:4.0.3 SWIFT_SNAPSHOT=4.0.3 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
# - os: linux
# dist: xenial
# sudo: required
# services: docker
# env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:4.1.3 SWIFT_SNAPSHOT=4.1.3 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
# - os: linux
# dist: xenial
# sudo: required
# services: docker
# env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:4.2.4 SWIFT_SNAPSHOT=4.2.4 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3 DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.0.3 SWIFT_SNAPSHOT=5.0.3 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.1.3 SWIFT_SNAPSHOT=4.1.3 DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.1 DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.2.4 SWIFT_SNAPSHOT=4.2.4 DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3 DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:5.1 DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 DOCKER_PRIVILEGED=true DOCKER_PRIVILEGED=true DOCKER_PACKAGES="libpq-dev postgresql postgresql-contrib locales locales-all" CUSTOM_BUILD_SCRIPT=.build-docker
- os: linux
dist: xenial
sudo: required
Expand Down
3 changes: 1 addition & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ let package = Package(
)
],
dependencies: [
//.package(url: "https://github.com/Kitura/Swift-Kuery.git", from: "3.1.0"),
.package(url: "https://github.com/Kitura/Swift-Kuery.git", .branch("master")),
.package(url: "https://github.com/Kitura/Swift-Kuery.git", from: "3.0.200"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down

0 comments on commit 08db787

Please sign in to comment.