Use valid semver identifiers for available_versions

From commit e3839d2
JuliaLang · Aug 15, 2022 · a59e5c8 · a59e5c8
1 parent 5cbd69d
commit a59e5c8
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/build.rs b/build.rs
@@ -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),
  },
  );
  }