Skip to content
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

Ubuntu 24.04, 23.10 Fedora 39 and Debian 12 #115

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Conversation

adam-fowler
Copy link
Contributor

@adam-fowler adam-fowler commented Jun 12, 2024

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

@adam-fowler
Copy link
Contributor Author

@shahmishal what is needed done here to CI working for swiftly

@futurejones
Copy link

Also use Dockerfiles from swift-docker/swift-ci/master as these are more up to date

These Dockerfiles are for building the swift toolchain from source and include many extra dependencies not required for a normal swift installation.

@adam-fowler
Copy link
Contributor Author

adam-fowler commented Jun 12, 2024

Also use Dockerfiles from swift-docker/swift-ci/master as these are more up to date

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 swift.org with these details at some point. I guess if the swift-ci files are for building swift this isn't correct. I chose these because docker files for the new OSs did not exist at the top level.

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

@adam-fowler
Copy link
Contributor Author

@patrickfreed

@patrickfreed
Copy link
Contributor

Thanks for fixing this up--will take a look tonight.

@0xTim
Copy link
Member

0xTim commented Jun 13, 2024

See swiftlang/swift-org-website#720 for reference

Copy link
Contributor

@patrickfreed patrickfreed left a comment

Choose a reason for hiding this comment

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

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)?

install/swiftly-install.sh Show resolved Hide resolved
# 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)"
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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.

@yim-lee
Copy link

yim-lee commented Jun 14, 2024

@yim-lee is that something you can help with

@patrickfreed Sorry nope, I don't have the power here.

@shahmishal
Copy link
Member

@swift-server-bot test this please

@shahmishal
Copy link
Member

@swift-server-bot test install please

1 similar comment
@adam-fowler
Copy link
Contributor Author

@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.
@patrickfreed
Copy link
Contributor

@shahmishal any update on getting these new platforms running in CI?

@MahdiBM
Copy link
Contributor

MahdiBM commented Jul 3, 2024

Worth noting, now that Apple is opening up to GitHub Actions, we could consider moving to GitHub Actions as well, sometime in the future.

@patrickfreed
Copy link
Contributor

Oh moving to GitHub actions would be wonderful. Would that be an option for swiftly @shahmishal?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants