Skip to content

Commit 72638d8

Browse files
authored
Remove tmpify_srcdir step and upgrade RootFS (#601)
Since we don't use QEMU anymore, disk I/O isn't quite as high-priority as it once was; it's okay to rely on `docker` for reasonable disk I/O.
1 parent 4b33e3e commit 72638d8

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

Artifacts.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,27 +2110,27 @@ os = "linux"
21102110
sha256 = "12cf3b9a673517c3bf21b6061391db1b358ab167ee4d435cd37d32175c72e5f7"
21112111
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/PlatformSupport-v2019.12.20+0/PlatformSupport-x86_64-w64-mingw32.v2019.12.20.x86_64-linux-musl.unpacked.tar.gz"
21122112

2113-
[["Rootfs.v2019.11.22.x86_64-linux-musl.squashfs"]]
2113+
[["Rootfs.v2020.1.7.x86_64-linux-musl.squashfs"]]
21142114
arch = "x86_64"
2115-
git-tree-sha1 = "327e2510b7c12d961a6b0440b801a76807111f9a"
2115+
git-tree-sha1 = "d090d25fc86f495a396f4bd7af7bbca54f0b5c10"
21162116
lazy = true
21172117
libc = "musl"
21182118
os = "linux"
21192119

2120-
[["Rootfs.v2019.11.22.x86_64-linux-musl.squashfs".download]]
2121-
sha256 = "7be077ca43c33d32b43b46a2f1649cc3ab2208a43770c45c8f4b274b77fd9199"
2122-
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2019.11.22+0/Rootfs.v2019.11.22.x86_64-linux-musl.squashfs.tar.gz"
2120+
[["Rootfs.v2020.1.7.x86_64-linux-musl.squashfs".download]]
2121+
sha256 = "f4332791e4d552693c9a0a5f7c6692cf2ded8d69139c5b0078c1e38256221197"
2122+
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2020.1.7+0/Rootfs.v2020.1.7.x86_64-linux-musl.squashfs.tar.gz"
21232123

2124-
[["Rootfs.v2019.11.22.x86_64-linux-musl.unpacked"]]
2124+
[["Rootfs.v2020.1.7.x86_64-linux-musl.unpacked"]]
21252125
arch = "x86_64"
2126-
git-tree-sha1 = "0f1867e8dbf4dfeaa77bb52ad707b86f74f0c80e"
2126+
git-tree-sha1 = "2e646abe9b45ce5da2884aee574025a8675d7e01"
21272127
lazy = true
21282128
libc = "musl"
21292129
os = "linux"
21302130

2131-
[["Rootfs.v2019.11.22.x86_64-linux-musl.unpacked".download]]
2132-
sha256 = "6e1f06bed61b3892b334486e59cc25abaed1178671b8b7f730a12d6f40d80d97"
2133-
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2019.11.22+0/Rootfs.v2019.11.22.x86_64-linux-musl.unpacked.tar.gz"
2131+
[["Rootfs.v2020.1.7.x86_64-linux-musl.unpacked".download]]
2132+
sha256 = "db1e7ebc581c878d3e013e7f2fc71f460ce589039d69d2789fbd63b2e37d83ce"
2133+
url = "https://github.com/JuliaPackaging/Yggdrasil/releases/download/Rootfs-v2020.1.7+0/Rootfs.v2020.1.7.x86_64-linux-musl.unpacked.tar.gz"
21342134

21352135
[["RustBase.v1.18.3.x86_64-linux-gnu.squashfs"]]
21362136
arch = "x86_64"

src/AutoBuild.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -662,15 +662,10 @@ function autobuild(dir::AbstractString,
662662
trap - DEBUG INT TERM ERR EXIT; \\
663663
set +e +x; \\
664664
echo Previous command \\\$! exited with \\\$RET >&2; \\
665-
save_srcdir; \\
666665
save_env; \\
667666
exit \\\$RET" \\
668667
INT TERM ERR
669668
670-
# Swap out srcdir from underneath our feet if we've got our `ERR`
671-
# traps set; if we don't have this, we get very confused. :P
672-
tmpify_srcdir
673-
674669
# Start saving everything into our history
675670
trap save_history DEBUG
676671
else

src/Rootfs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ consists of four shards, but that may not always be the case.
345345
"""
346346
function choose_shards(p::Platform;
347347
compilers::Vector{Symbol} = [:c],
348-
rootfs_build::VersionNumber=v"2019.11.22",
348+
rootfs_build::VersionNumber=v"2020.01.07",
349349
ps_build::VersionNumber=v"2019.12.20",
350350
GCC_builds::Vector{VersionNumber}=[v"4.8.5", v"5.2.0", v"6.1.0", v"7.1.0", v"8.1.0", v"9.1.0"],
351351
LLVM_builds::Vector{VersionNumber}=[v"6.0.1", v"7.1.0", v"8.0.1", v"9.0.1"],

0 commit comments

Comments
 (0)