Ubuntu 24.04, 23.10 Fedora 39 and Debian 12 #115
Conversation
|
@shahmishal what is needed done here to CI working for swiftly |
These Dockerfiles are for building the swift toolchain from source and include many extra dependencies not required for a normal swift installation. |
Currently swiftly-install.sh parses the Dockerfiles to extract the dependencies required to run swift, not an ideal solution. I'm hoping we can get some files served from I will change this to load from the original nightly-main and use swift-ci as a backup if files don't exist in nightly-main |
|
Thanks for fixing this up--will take a look tonight. |
|
See swiftlang/swift-org-website#720 for reference |
There was a problem hiding this comment.
looks great, just have two tiny suggestions.
Looks like we're going to need to update the testing matrix to include these new platforms. @yim-lee is that something you can help with (or @shahmishal)?
| # if we couldn't find Dockerfile in nightly-main use swift-ci/master version | ||
| if [[ -z "$dockerfile" ]]; then | ||
| dockerfile_url="https://raw.githubusercontent.com/swiftlang/swift-docker/main/swift-ci/master/$docker_platform_name/$docker_platform_version/Dockerfile" | ||
| dockerfile="$(curl --silent --retry 3 --location --fail $dockerfile_url)" |
There was a problem hiding this comment.
to avoid duplicating this incantation, can we factor it out to a function we can call here and above? we can also move the set +e and set -e in there too.
There was a problem hiding this comment.
Do you want the curl call and set +e -e in a separate function or the full test one location if it doesn't exist test the other location
There was a problem hiding this comment.
I was just thinking the curl and set +e -e so we could avoid duplicating the curl invocation. That way if we ever need to change the arguments or whatever we can do it in once place.
@patrickfreed Sorry nope, I don't have the power here. |
|
@swift-server-bot test this please |
|
@swift-server-bot test install please |
1 similar comment
|
@swift-server-bot test install please |
Use dockerfiles from swift-ci/master as these are more up to date
Only use if we cannot find the Dockerfile in nightly-main.
|
@shahmishal any update on getting these new platforms running in CI? |
|
Worth noting, now that Apple is opening up to GitHub Actions, we could consider moving to GitHub Actions as well, sometime in the future. |
|
Oh moving to GitHub actions would be wonderful. Would that be an option for swiftly @shahmishal? |
|
Would be great to merge this PR. |
|
This hasn't been merged because the init phase of swiftly is being rewritten to be implemented inside swiftly itself. We'll make sure to include the new OS's then. |
|
Thanks, I assume in #127 ? |
yes |
|
Closing in favour of #152 |
Add support in install script for Ubuntu 24.04, 23.10 Fedora 39 and Debian 12
Also use Dockerfiles from swift-docker/swift-ci/master if Dockerfile does not exist in nightly-main
Replace calls to printf with echo as on Fedora dockerfile has
%{which is treated as a formatted parameter