Skip to content

Commit

Permalink
Merge remote-tracking branch 'dojo/main' into skip-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Jun 13, 2024
2 parents 359a94e + af5be66 commit a62e872
Show file tree
Hide file tree
Showing 29 changed files with 841 additions and 765 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN echo "deb http://apt.llvm.org/${VARIANT}/ llvm-toolchain-${VARIANT}-17 main"
RUN apt-get -y install -t llvm-toolchain-${VARIANT}-17 llvm-17 llvm-17-dev llvm-17-runtime clang-17 clang-tools-17 lld-17 libpolly-17-dev libmlir-17-dev mlir-17-tools

RUN curl -L https://foundry.paradigm.xyz/ | bash && . /root/.bashrc && foundryup
ENV PATH="${PATH}:/root/.foundry/bin"

# To build Katana with 'native' feature, we need to set the following environment variables
ENV MLIR_SYS_170_PREFIX=/usr/lib/llvm-17
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions bin/sozo/src/commands/migrate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ fn is_compatible_version(provided_version: &str, expected_version: &str) -> Resu
.map_err(|e| anyhow!("Failed to parse expected version '{}': {}", expected_version, e))?;

// Specific backward compatibility rule: 0.6 is compatible with 0.7.
if (provided_ver.major == 0 && provided_ver.minor == 6)
&& (expected_ver.major == 0 && expected_ver.minor == 7)
if (provided_ver.major == 0 && provided_ver.minor == 7)
&& (expected_ver.major == 0 && expected_ver.minor == 6)
{
return Ok(true);
}
Expand Down Expand Up @@ -246,7 +246,9 @@ mod tests {

#[test]
fn test_is_compatible_version_specific_backward_compatibility() {
assert!(is_compatible_version("0.6.0", "0.7.1").unwrap());
let node_version = "0.7.1";
let katana_version = "0.6.0";
assert!(is_compatible_version(node_version, katana_version).unwrap());
}

#[test]
Expand Down
Loading

0 comments on commit a62e872

Please sign in to comment.