Skip to content

Conversation

@thomasvl
Copy link
Member

6.2.3 would be current, but there doesn't seem to be a download for 2004, so this keeps everything else consistent.

@thomasvl
Copy link
Member Author

This is attempting to follow the directions on #14033 (comment),.

I'm not sure how to test it, so hopefully CI will do that for me.

@thomasvl
Copy link
Member Author

The Ubuntu File Synchronization Check seems busted, it seems like since the Dockerfiles and install script differ in the use of _ vs -, it is reporting files that don't exist.

@thomasvl
Copy link
Member Author

@hunsche @DavidKorczynski fyi on the failing check, but also how do I test these to be sure they are right?

@thomasvl thomasvl force-pushed the update_swift branch 2 times, most recently from 20e83c1 to 47f2d76 Compare December 15, 2025 20:00
@thomasvl
Copy link
Member Author

The Ubuntu File Synchronization Check seems busted, it seems like since the Dockerfiles and install script differ in the use of _ vs -, it is reporting files that don't exist.

Looks like the check is only correct for the Dockerfile checks. All of the scripts it is trying to check use hyphens and not underscores.

@thomasvl
Copy link
Member Author

@hunsche @DavidKorczynski - I believe this is now ready to go.

See my note above about Version Check not being correct for the install file naming (just the Dockerfile naming). Not sure how to clear that problem.

@thomasvl
Copy link
Member Author

The Ubuntu File Synchronization Check seems busted, it seems like since the Dockerfiles and install script differ in the use of _ vs -, it is reporting files that don't exist.

Looks like the check is only correct for the Dockerfile checks. All of the scripts it is trying to check use hyphens and not underscores.

Correction, one uses hyphens (install_deps_ubuntu*), rest use underscores:

❯ find infra -name "*2[04][_-]04*.sh"
infra/base-images/base-runner/install_deps_ubuntu_24_04.sh
infra/base-images/base-runner/install_deps_ubuntu_20_04.sh
infra/base-images/base-builder/install_swift_ubuntu_24_04.sh
infra/base-images/base-builder/install_swift_ubuntu_20_04.sh
infra/base-images/base-builder/install_deps_ubuntu-24-04.sh
infra/base-images/base-builder/install_deps_ubuntu-20-04.sh
infra/base-images/base-clang/checkout_build_install_llvm_ubuntu_20_04.sh
infra/base-images/base-clang/checkout_build_install_llvm_ubuntu_24_04.sh

@thomasvl
Copy link
Member Author

Went ahead and renamed the two install_swift_ubuntu*.sh files to match the check, now everything passes.

@thomasvl
Copy link
Member Author

@hunsche @DavidKorczynski - can one of you do the /gcbrun?

@thomasvl thomasvl force-pushed the update_swift branch 3 times, most recently from 4bfbcd1 to 2e152b2 Compare December 18, 2025 17:19
6.2.3 would be current, but there doesn't seem to be a download for 2004,
so this keeps everything else consistent.

Update support packages based on: https://www.swift.org/install/linux/tarball/
The generic check has the names coded differently, try rename the files to match
how the check is coded.
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.

1 participant