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.

Sign up for GitHub

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

nightly channels rebased #384

Closed
wants to merge 16 commits into from
+268 −643
Closed

nightly channels rebased #384

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c36986f
support nightly channels
simeonschaub Dec 27, 2021
ccfbefb
Remove unnecessary code
davidanthoff Dec 30, 2021
1b9e8dd
fix
simeonschaub Jan 25, 2022
bc36695
remove unused functions
visr Jul 1, 2022
0c6ddc8
add GlobalPaths argument to install_version
visr Jul 1, 2022
1389a52
no mac aarch64 1.7.3 build
visr Jul 1, 2022
8c34763
restore build.rs from before latest rebase
visr Aug 15, 2022
5cbd69d
Make aarch64 default on Mac starting with 1.8.0-rc3
visr Aug 15, 2022
a59e5c8
Use valid semver identifiers for available_versions
visr Aug 15, 2022
e18941f
Add Julia 1.6.7
davidanthoff Jul 20, 2022
393b41e
Add minor channels for prerelease
davidanthoff Jul 30, 2022
1154c74
Add Julia 1.8.0-rc4
davidanthoff Aug 9, 2022
da921d7
Add Julia 1.8.0
davidanthoff Aug 17, 2022
137620b
Merge branch 'main' into night
visr Aug 19, 2022
32cb928
Merge branch 'main' into night
visr Oct 7, 2022
cc2f488
Merge branch 'main' into night
visr Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use valid semver identifiers for available_versions 
From commit e3839d2
@visr
visr committed Aug 15, 2022

Verified

This commit was signed with the committer’s verified signature.
addaleax Anna Henningsen
GPG key ID: A94130F0BFC8EBE9
Verified
Learn about vigilant mode
commit a59e5c821cd4fed42ca02a19c5f8131067c3823b
58 changes: 29 additions & 29 deletions build.rs
View file
Original file line number Diff line number Diff line change
@@ -134,22 +134,22 @@ fn add_version(

if target_os == "windows" && target_arch == "x86_64" {
db.available_versions.insert(
format!("{}+0~x64", v),
format!("{}+0.x64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/winnt/x64/{}-win64.tar.gz", middle_part),
nightly: nightly,
}
);
db.available_versions.insert(
format!("{}+0~x86", v),
format!("{}+0.x86", v),
JuliaupVersionDBVersion {
url_path: format!("bin/winnt/x86/{}-win32.tar.gz", middle_part),
nightly: nightly,
}
);
} else if target_os == "windows" && target_arch == "x86" {
db.available_versions.insert(
format!("{}+0~x86", v),
format!("{}+0.x86", v),
JuliaupVersionDBVersion {
url_path: format!("bin/winnt/x86/{}-win32.tar.gz", middle_part),
nightly: nightly,
@@ -159,30 +159,30 @@ fn add_version(
if nightly {
if target_arch == "x86_64" {
db.available_versions.insert(
format!("{}+0~x64", v),
format!("{}+0.x64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/x64/{}-linux64.tar.gz", middle_part),
nightly: nightly,
}
);
db.available_versions.insert(
format!("{}+0~x86", v),
format!("{}+0.x86", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/x86/{}-linux32.tar.gz", middle_part),
nightly: nightly,
}
);
} else if target_arch == "x86" {
db.available_versions.insert(
format!("{}+0~x86", v),
format!("{}+0.x86", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/x86/{}-linux-i686.tar.gz", middle_part),
nightly: nightly,
}
);
} else if target_arch == "aarch64" {
db.available_versions.insert(
format!("{}+0~aarch64", v),
format!("{}+0.aarch64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/aarch64/{}-linuxaarch64.tar.gz", middle_part),
nightly: nightly,
@@ -194,30 +194,30 @@ fn add_version(
} else {
if target_arch == "x86_64" {
db.available_versions.insert(
format!("{}+0~x64", v),
format!("{}+0.x64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/x64/{}-linux-x86_64.tar.gz", middle_part),
nightly: nightly,
}
);
db.available_versions.insert(
format!("{}+0~x86", v),
format!("{}+0.x86", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/x86/{}-linux-i686.tar.gz", middle_part),
nightly: nightly,
}
);
} else if target_arch == "x86" {
db.available_versions.insert(
format!("{}+0~x86", v),
format!("{}+0.x86", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/x86/{}-linux-i686.tar.gz", middle_part),
nightly: nightly,
}
);
} else if target_arch == "aarch64" {
db.available_versions.insert(
format!("{}+0~aarch64", v),
format!("{}+0.aarch64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/linux/aarch64/{}-linux-aarch64.tar.gz", middle_part),
nightly: nightly,
@@ -229,15 +229,15 @@ fn add_version(
}
} else if target_os == "macos" && target_arch == "x86_64"{
db.available_versions.insert(
format!("{}+0~x64", v),
format!("{}+0.x64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/mac/x64/{}-mac64.tar.gz", middle_part),
nightly: nightly,
}
);
} else if target_os == "macos" && target_arch == "aarch64"{
db.available_versions.insert(
format!("{}+0~x64", v),
format!("{}+0.x64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/mac/x64/{}-mac64.tar.gz", middle_part),
nightly: nightly,
@@ -247,7 +247,7 @@ fn add_version(
if v >= &Version::new(1,7, 0) && v != &Version::new(1,7, 3){
if !nightly {
db.available_versions.insert(
format!("{}+0~aarch64", v),
format!("{}+0.aarch64", v),
JuliaupVersionDBVersion {
url_path: format!("bin/mac/aarch64/{}-macaarch64.tar.gz", middle_part),
nightly: nightly,
@@ -279,102 +279,102 @@ fn add_channels(
db.available_channels.insert(
format!("{}", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x64", v),
version: format!("{}+0.x64", v),
},
);
db.available_channels.insert(
format!("{}~x64", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x64", v),
version: format!("{}+0.x64", v),
},
);
db.available_channels.insert(
format!("{}~x86", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x86", v),
version: format!("{}+0.x86", v),
},
);
} else if target_arch == "x86" {
db.available_channels.insert(
format!("{}", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x86", v),
version: format!("{}+0.x86", v),
},
);
db.available_channels.insert(
format!("{}~x86", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x86", v),
version: format!("{}+0.x86", v),
},
);
} else if target_arch == "aarch64" {
if target_os == "windows" {
db.available_channels.insert(
format!("{}", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x86", v),
version: format!("{}+0.x86", v),
},
);
db.available_channels.insert(
format!("{}~x64", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x64", v),
version: format!("{}+0.x64", v),
},
);
db.available_channels.insert(
format!("{}~x86", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x86", v),
version: format!("{}+0.x86", v),
},
);
} else if target_os == "linux" {
db.available_channels.insert(
format!("{}", name),
JuliaupVersionDBChannel {
version: format!("{}+0~aarch64", v),
version: format!("{}+0.aarch64", v),
},
);
db.available_channels.insert(
format!("{}~aarch64", name),
JuliaupVersionDBChannel {
version: format!("{}+0~aarch64", v),
version: format!("{}+0.aarch64", v),
},
);
} else if target_os == "macos" {
if v >= &&(Version { major: 1, minor: 8, patch: 0, pre: Prerelease::new("rc3").unwrap(), build: semver::BuildMetadata::EMPTY}) {
db.available_channels.insert(
format!("{}", name),
JuliaupVersionDBChannel {
version: format!("{}+0~aarch64", v),
version: format!("{}+0.aarch64", v),
},
);
} else {
db.available_channels.insert(
format!("{}", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x64", v),
version: format!("{}+0.x64", v),
},
);
}
db.available_channels.insert(
format!("{}~x64", name),
JuliaupVersionDBChannel {
version: format!("{}+0~x64", v),
version: format!("{}+0.x64", v),
},
);
if v == &Version::new(1,7, 3) {
// This is a hack because there is no aarch64 for 1.7.3, so we fall back to the 1.7.2 version
db.available_channels.insert(
format!("{}~aarch64", name),
JuliaupVersionDBChannel {
version: format!("{}+0~aarch64", Version::new(1,7, 2)),
version: format!("{}+0.aarch64", Version::new(1,7, 2)),
},
);
} else if v >= &Version::new(1,7, 0) {
db.available_channels.insert(
format!("{}~aarch64", name),
JuliaupVersionDBChannel {
version: format!("{}+0~aarch64", v),
version: format!("{}+0.aarch64", v),
},
);
}