Commit 5d0da41

authored

Use an SSH URL to fetch Runtime in CI (#3)

Use an SSH URL to fetch Runtime in CI (Same as: apple/swift-openapi-generator#3) ### Motivation Until the swift-openapi-runtime repository is made public, it cannot be cloned using a HTTPS package URL without authentication, which is what this package is using in its Package.swift. This means CI isn't able to run for this package. However, CI is able to clone this repository over SSH, which presents an opportunity for a temporary workaround. ### Modifications Add a temporary step to the Docker Compose CI flow, which creates a Git config in a shared ephemeral volume with the following contents: ```gitconfig [url "git@github.com:apple/swift-openapi-runtime"] insteadOf = https://github.com/apple/swift-openapi-runtime ``` ### Result The CI should be able to clone the private dependency and then succeed. ### Test Plan Locally, this works: ```console ❯ docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.2204.58.yaml run test ... + swift test -Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error ... Fetching https://github.com/apple/swift-openapi-runtime ... Fetched https://github.com/apple/swift-openapi-runtime (2.68s) ... Executed 86 tests, with 0 failures (0 unexpected) in 3.265 (3.265) seconds ``` Also, if we use can use the `shell` Docker Compose service to see things are configured correctly: ```console root@20ab69e3f292:/code# echo $GIT_CONFIG_GLOBAL /ci-gitconfig/gitconfig root@20ab69e3f292:/code# cat $GIT_CONFIG_GLOBAL [url "git@github.com:apple/swift-openapi-runtime"] insteadOf = https://github.com/apple/swift-openapi-runtime ``` Reviewed by: simonjbeaumont Builds: ✔︎ pull request validation (5.8) - Build finished. ✔︎ pull request validation (5.9) - Build finished. ✔︎ pull request validation (nightly) - Build finished. ✔︎ pull request validation (soundness) - Build finished. #3

1 parent ccc7b5b commit 5d0da41Copy full SHA for 5d0da41

File tree

1 file changed

+13

-0

lines changed

docker
- docker-compose.yaml

1 file changed

+13

-0

lines changed

`‎docker/docker-compose.yaml‎`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,24 @@ services:`
`15`	`15`	`build:`
`16`	`16`	`context: .`
`17`	`17`	`dockerfile: Dockerfile`
	`18`	`+ # Note: This temporary step creates a gitconfig to use SSH for a dependency`
	`19`	`+ # that is not yet public. This can be removed once it is public.`
	`20`	`+ command: git config --global url."git@github.com:apple/swift-openapi-runtime".insteadOf "https://github.com/apple/swift-openapi-runtime"`
	`21`	`+ volumes:`
	`22`	`+ - ci-gitconfig:/ci-gitconfig`
	`23`	`+ environment:`
	`24`	`+ - GIT_CONFIG_GLOBAL=/ci-gitconfig/gitconfig`
`18`	`25`
`19`	`26`	`common: &common`
`20`	`27`	`image: *image`
`21`	`28`	`depends_on: [runtime-setup]`
`22`	`29`	`volumes:`
`23`	`30`	`- ~/.ssh:/root/.ssh`
`24`	`31`	`- ..:/code:z`
	`32`	`+ - ci-gitconfig:/ci-gitconfig`
`25`	`33`	`working_dir: /code`
	`34`	`+ environment:`
	`35`	`+ - GIT_CONFIG_GLOBAL=/ci-gitconfig/gitconfig`
`26`	`36`
`27`	`37`	`soundness:`
`28`	`38`	`<<: *common`
`@@ -35,3 +45,6 @@ services:`
`35`	`45`	`shell:`
`36`	`46`	`<<: *common`
`37`	`47`	`entrypoint: /bin/bash`
	`48`	`+`
	`49`	`+volumes:`
	`50`	`+ ci-gitconfig:`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5d0da41

File tree

1 file changed

1 file changed

`‎docker/docker-compose.yaml‎`

0 commit comments