Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ description = """This repository contains a cross-platform installer for the Jul

toolchain = {'name': 'GCCcore', 'version': '12.3.0'}

patches = ['juliaup-1.17.9_fix-julia-version-in-test.patch']
checksums = [
{'juliaup-1.17.9.tar.gz': '623e65f93377b21096e2fec84c7474ed940d10956ca5d51dbaf04e3b428e0261'},
{'addr2line-0.24.2.tar.gz': 'dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1'},
Expand Down Expand Up @@ -273,6 +274,8 @@ checksums = [
{'zerocopy-0.7.35.tar.gz': '1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0'},
{'zerocopy-derive-0.7.35.tar.gz': 'fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e'},
{'zeroize-1.8.1.tar.gz': 'ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde'},
{'juliaup-1.17.9_fix-julia-version-in-test.patch':
'5bc2082f3d0f1c34d322675561c78512a198acbd3f201d3dc27b01dc04378f5f'},
]

crates = [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Make a test more Julia version agnostic to avoid it failing:

> Unexpected stderr, failed (var.starts_with("Installing Julia 1.11") && ((! var.contains(apple.darwin14)) || (var.contains(Checking standard library notarization) && var.ends_with("done.\n"))))
> ├── var as str: Installing Julia 1.12.0+0.x64.linux.gnu
> └── var.starts_with("Installing Julia 1.11")

Based on https://github.com/JuliaLang/juliaup/pull/1131/commits/8afc99c5f9a7da6b84068f1dcf47e7270f462587

Author: Alexander Grund (TU Dresden)

diff -ur a/tests/command_initial_setup_from_launcher_test.rs b/tests/command_initial_setup_from_launcher_test.rs
--- a/tests/command_initial_setup_from_launcher_test.rs
+++ b/tests/command_initial_setup_from_launcher_test.rs
@@ -20,7 +20,7 @@
.success()
.stdout(predicate::str::is_empty())
.stderr(
- predicate::str::starts_with("Installing Julia 1.11.1").and(
+ predicate::str::starts_with("Installing Julia 1.").and(
predicate::str::contains("apple.darwin14")
.not()
.or(