Update Swift to 6.1.3

[thomasvl]

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

[thomasvl]

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]

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]

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

[thomasvl]

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]

@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]

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]

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

[thomasvl]

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

[decoNR]

/gcbrun

[thomasvl]

@decoNR thanks, looks like everything passed?

@hunsche @DavidKorczynski - anything else needed before this could be merged?

[decoNR]

@decoNR thanks, looks like everything passed?

Yes, nice. @DavidKorczynski, could you take a look to see if we can merge this? Thank you.

[thomasvl]

Should I sync my branch up and push it again? Not sure if that will reset some of the test states.

[DavidKorczynski]

Apologies for the delay on this one.

Do you know how this correlates with #14342 ? In essence, which version is most desirable, I assume then newest, 6.2?

[thomasvl]

Apologies for the delay on this one.

Do you know how this correlates with #14342 ? In essence, which version is most desirable, I assume then newest, 6.2?

tl;dr; - I'm happy to drop this and go with the #14342 since it updates SwiftProtobuf and that's what I was after.

I didn't know about that one. So that's doing 6.2.x, and I only did 6.1.x. I did 6.1.x because of the 20.04 images, I didn't see a Swift release of 6.2 for that OS version. If I'm reading things correctly, #14342 avoid that by only updating the 24.04 image and moving three projects over to that newer image. Given I only look at this from the pov of SwiftProtobuf, I'm good with that PR also.

So I think this sorta comes down to what do you all want for oss-fuzz? #14342 gets your newest image on the latests Swift release. But if you still care about 20.04, maybe you (also?) want this PR to update that one. I guess in theory you should be able to land this and then stack #14342 on top, and thus move both of your base images forward, just to different Swift versions.

[thomasvl]

@DavidKorczynski did you want me to just drop this in favor of the other one?

[DavidKorczynski]

/gcbrun trial_build.py swift-nio swift-protobuf grpc-swift --force-build

[DavidKorczynski]

if the trial run succeeds then this is good to go!

[thomasvl]

if the trial run succeeds then this is good to go!

[Edited]

Hm, the trial failed this time around, looking at the logs, the submodules aren't being fetched, I've opened #14830 to attempt to ensure they are always fetched.

[thomasvl]

@DavidKorczynski I've rebased to have the fix to the swift-protobuf build, so hopefully the next trial-build will pass.

[DavidKorczynski]

/gcbrun trial_build.py swift-nio swift-protobuf grpc-swift --force-build

[thomasvl]

Looks like everything passed?

[thomasvl]

@DavidKorczynski should I sync/upload again? Can this be landed?

[DavidKorczynski]

/gcbrun trial_build.py swift-nio swift-protobuf grpc-swift --force-build

[DavidKorczynski]

Success: https://storage.cloud.google.com/oss-fuzz-trialbuild-logs/log-735dc7d0-1e56-4c84-b732-aba72b834595.txt

[DavidKorczynski]

/gcbrun trial_build.py expat assimp ffmpeg quickjs skcms --fuzzing-engines libfuzzer --sanitizers address

[thomasvl]

@DavidKorczynski are those packages also using Swift? I'm not immediately sure to do about that error for expat build as I'm not sure what it has to do with the changes here.

[DavidKorczynski]

@DavidKorczynski are those packages also using Swift? I'm not immediately sure to do about that error for expat build as I'm not sure what it has to do with the changes here.

I wanted to a double check on the base images. 4/5 succeeded -- am not entirely sure about the expat. I'll try locally and if it works then we should land this.

[DavidKorczynski]

lgtm. Can confirm all these work locally as well:

python3 infra/helper.py build_fuzzers expat
python3 infra/helper.py build_fuzzers --architecture=i386 expat
python3 infra/helper.py build_fuzzers swift-nio

in particular highlighting expat for i386 which failed in the CI.

[thomasvl]

Thank you!

[DavidKorczynski]

Thanks again @thomasvl -- and thanks for the patience.

Can conform swift-nio now builds with the updated base image: https://oss-fuzz-build-logs.storage.googleapis.com/index.html#swift-nio