Skip to content

Commit

Permalink
Pin dojo plugin version
Browse files Browse the repository at this point in the history
  • Loading branch information
tarrencev committed Nov 27, 2023
1 parent 02da8df commit a353fde
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 31 deletions.
4 changes: 2 additions & 2 deletions crates/dojo-core/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies = [

[[package]]
name = "dojo_plugin"
version = "0.3.12"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.12#12d58f29ec53454317f1f6d265007a053d279288"
version = "0.3.11"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7d8aa29a92062fcb9e6659"
2 changes: 1 addition & 1 deletion crates/dojo-core/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "dojo"
version = "0.3.12"

[dependencies]
dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.12" }
dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.11" }
starknet = "2.3.1"
2 changes: 1 addition & 1 deletion crates/dojo-lang/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "dojo_plugin"
version = "0.3.12"
version = "0.3.11"

[cairo-plugin]
13 changes: 0 additions & 13 deletions crates/dojo-lang/build.rs

This file was deleted.

4 changes: 2 additions & 2 deletions crates/dojo-lang/src/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ impl BuiltinDojoPlugin {
impl CairoPlugin for BuiltinDojoPlugin {
fn id(&self) -> PackageId {
let url = Url::parse("https://github.com/dojoengine/dojo").unwrap();
let version = env!("CARGO_PKG_VERSION");
let rev = env!("GIT_HASH");
let version = "0.3.11";
let rev = "1e651b5d4d3b79b14a7d8aa29a92062fcb9e6659";

let source_id =
SourceId::for_git(&url, &scarb::core::GitReference::Tag(format!("v{version}").into()))
Expand Down
10 changes: 0 additions & 10 deletions crates/dojo-test-utils/build.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#[cfg(feature = "build-examples")]
fn main() {
use std::env;
use std::process::Command;

use camino::{Utf8Path, Utf8PathBuf};
use dojo_lang::compiler::DojoCompiler;
Expand All @@ -11,15 +10,6 @@ fn main() {
use scarb::ops::{self, CompileOpts};
use scarb_ui::Verbosity;

let version = env!("CARGO_PKG_VERSION");
let output = Command::new("git")
.args(["rev-list", "-n", "1", &format!("v{version}")])
.output()
.expect("Failed to execute command");

let git_hash = String::from_utf8(output.stdout).unwrap().trim().to_string();
println!("cargo:rustc-env=GIT_HASH={}", git_hash);

let project_paths = ["../../examples/spawn-and-move", "../torii/graphql/src/tests/types-test"];

project_paths.iter().for_each(|path| compile(path));
Expand Down
4 changes: 2 additions & 2 deletions examples/spawn-and-move/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ dependencies = [

[[package]]
name = "dojo_plugin"
version = "0.3.12"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.12#12d58f29ec53454317f1f6d265007a053d279288"
version = "0.3.11"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7d8aa29a92062fcb9e6659"

0 comments on commit a353fde

Please sign in to comment.