Skip to content

Commit bc34374

Browse files
committed
Swift: switch to downloading the 20.04 toolchain
1 parent e25a655 commit bc34374

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

swift/third_party/load.bzl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ _swift_version = _swift_prebuilt_version.rpartition(".")[0]
2020

2121
_toolchain_info = {
2222
"linux": struct(
23-
platform = "ubuntu2204",
24-
suffix = "ubuntu22.04",
23+
platform = "ubuntu2004",
24+
suffix = "ubuntu20.04",
2525
extension = "tar.gz",
26-
sha = "bca015e9d727ca39385d7e5b5399f46302d54a02218d40d1c3063662ffc6b42f",
26+
sha = "5fca0c384a1cdf9b3d4f71bcab5ff27aaee25f4bc09a134b16fa7fcf34e34c45",
2727
),
2828
"macos": struct(
2929
platform = "xcode",
@@ -78,7 +78,8 @@ def _pkg_archive_impl(repository_ctx):
7878
sha256 = repository_ctx.attr.sha256,
7979
)
8080
if not repository_ctx.attr.sha256:
81-
print("please set sha256 = %s" % repr(res.sha256))
81+
print("Rule '%s' indicated that a canonical reproducible form " % repository_ctx.name +
82+
"can be obtained by modifying arguments sha256 = \"%s\"" % res.sha256)
8283
_run(repository_ctx, "extracting %s" % dir, "xar -xf %s" % archive)
8384
repository_ctx.delete(archive)
8485
_run(
@@ -100,8 +101,6 @@ _pkg_archive = repository_rule(
100101
},
101102
)
102103

103-
# TODO apply the same mechanism to the macOS toolchain (needs some work as the toolchain is a pkg archive
104-
105104
def _github_archive(*, name, repository, commit, build_file = None, sha256 = None):
106105
github_name = repository[repository.index("/") + 1:]
107106
maybe(

0 commit comments

Comments
 (0)