Skip to content

Commit

Permalink
JlrsCore has been released, so install a released version by default
Browse files Browse the repository at this point in the history
  • Loading branch information
Taaitaaiger committed Apr 21, 2023
1 parent c9d203d commit 9b67d5b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:

- name: Run tests
run: |
julia -e "import Pkg; Pkg.add(url=\"https://github.com/Taaitaaiger/JlrsCore.jl\")"
julia -e "import Pkg; Pkg.add(\"JlrsCore\")"
export JULIA_DIR="$(dirname $(dirname $(which julia)))"
export LD_LIBRARY_PATH="${JULIA_DIR}/lib:${JULIA_DIR}/lib/julia:${LD_LIBRARY_PATH}"
cargo test --features full,julia-1-6 --verbose
Expand Down
6 changes: 3 additions & 3 deletions jlrs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -829,9 +829,9 @@ pub mod util;
/// is used.
#[derive(Clone)]
pub enum InstallJlrsCore {
/// Install the current default revision of JlrsCore.jl
/// Install the most recent version of JlrsCore
Default,
/// Don't install the JlrsCore package
/// Don't install the JlrsCore
No,
/// Install the given version
Version {
Expand Down Expand Up @@ -861,7 +861,7 @@ impl InstallJlrsCore {
try
using JlrsCore
catch e
import Pkg; Pkg.add(url=\"https://github.com/Taaitaaiger/JlrsCore.jl#c4710a4\")
import Pkg; Pkg.add(\"JlrsCore\")
using JlrsCore
end
end",
Expand Down
2 changes: 1 addition & 1 deletion jlrs/src/memory/context/ledger.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// The ledger is used to track Julia data. It's implemented in a separate crate and distributed
// as JlrsLedger_jll which is a dependency of JlrsCore.jl. The reason it works this way is because
// as JlrsLedger_jll which is a dependency of JlrsCore. The reason it works this way is because
// multiple packages could use different versions of jlrs and have been compiled with different
// versions of Rust, all of these packages must use the same ledger.
//
Expand Down
8 changes: 4 additions & 4 deletions jlrs/src/runtime/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ cfg_if::cfg_if! {
self
}

/// Enable or disable automatically installing JlrsCore.jl.
/// Enable or disable automatically installing JlrsCore.
///
/// In order to function correctly, jlrs requires that the JlrsCore.jl package is installed. By
/// In order to function correctly, jlrs requires that the JlrsCore package is installed. By
/// default, this package is automatically installed if it hasn't been installed yet.
pub fn install_jlrs(mut self, install: InstallJlrsCore) -> Self {
self.builder.install_jlrs_core = install;
Expand Down Expand Up @@ -258,9 +258,9 @@ impl RuntimeBuilder {
self
}

/// Enable or disable automatically installing JlrsCore.jl.
/// Enable or disable automatically installing JlrsCore.
///
/// In order to function correctly, jlrs requires that the JlrsCore.jl package is installed. By
/// In order to function correctly, jlrs requires that the JlrsCore package is installed. By
/// default, this package is automatically installed if it hasn't been installed yet.
pub fn install_jlrs(mut self, install: InstallJlrsCore) -> Self {
self.install_jlrs_core = install;
Expand Down
2 changes: 1 addition & 1 deletion julia_module_test/JuliaModuleTest.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module JuliaModuleTestTests
try
using JlrsCore
catch e
import Pkg; Pkg.add(url="https://github.com/Taaitaaiger/JlrsCore.jl")
import Pkg; Pkg.add("JlrsCore")
using JlrsCore
end

Expand Down

0 comments on commit 9b67d5b

Please sign in to comment.