Set preceise

dojoengine · Nov 20, 2023 · 0ff1fef · 0ff1fef
1 parent 5c70e88
commit 0ff1fef
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -141,6 +141,9 @@ jobs:
           sudo apt-get install -y gcc-aarch64-linux-gnu libssl-dev
           echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
 
+      - name: Set GIT_HASH environment variable
+        run: echo "GIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
       - name: Build binaries
         run: cargo build --release --bins --target ${{ matrix.job.target }}
 

diff --git a/crates/dojo-core/Scarb.lock b/crates/dojo-core/Scarb.lock
@@ -3,11 +3,12 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.3.6"
+version = "0.3.10"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.3.6"
+version = "0.3.10"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.10#be1676252c41f8188465741edcbcb381d2c12080"
diff --git a/crates/dojo-defi/Scarb.lock b/crates/dojo-defi/Scarb.lock
@@ -8,19 +8,20 @@ source = "git+https://github.com/ponderingdemocritus/cubit#9c3bbdfee7b165ab06ac8
 
 [[package]]
 name = "dojo"
-version = "0.3.3"
+version = "0.3.10"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_defi"
-version = "0.3.3"
+version = "0.3.10"
 dependencies = [
  "cubit",
  "dojo",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.3.3"
+version = "0.3.10"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.10#be1676252c41f8188465741edcbcb381d2c12080"
diff --git a/crates/dojo-erc/Scarb.lock b/crates/dojo-erc/Scarb.lock
@@ -3,18 +3,19 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.3.1"
+version = "0.3.10"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_erc"
-version = "0.3.1"
+version = "0.3.10"
 dependencies = [
  "dojo",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.3.1"
+version = "0.3.10"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.10#be1676252c41f8188465741edcbcb381d2c12080"
diff --git a/crates/dojo-lang/src/plugin.rs b/crates/dojo-lang/src/plugin.rs
@@ -189,12 +189,17 @@ impl CairoPlugin for BuiltinDojoPlugin {
     fn id(&self) -> PackageId {
         let url = Url::parse("https://github.com/dojoengine/dojo").unwrap();
         let version = env!("CARGO_PKG_VERSION");
-        PackageId::new(
-            PackageName::new(PACKAGE_NAME),
-            Version::parse(version).unwrap(),
+
+        let mut source_id =
             SourceId::for_git(&url, &scarb::core::GitReference::Tag(format!("v{version}").into()))
-                .unwrap(),
-        )
+                .unwrap();
+
+        let rev = option_env!("GIT_HASH");
+        if let Some(rev) = rev {
+            source_id = source_id.with_precise(rev.to_string()).unwrap()
+        }
+
+        PackageId::new(PackageName::new(PACKAGE_NAME), Version::parse(version).unwrap(), source_id)
     }
 
     fn instantiate(&self) -> Result<Box<dyn CairoPluginInstance>> {

diff --git a/crates/dojo-primitives/Scarb.lock b/crates/dojo-primitives/Scarb.lock
@@ -3,18 +3,19 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "0.3.1"
+version = "0.3.10"
 dependencies = [
  "dojo_plugin",
 ]
 
 [[package]]
 name = "dojo_plugin"
-version = "0.3.1"
+version = "0.3.10"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.10#be1676252c41f8188465741edcbcb381d2c12080"
 
 [[package]]
 name = "dojo_primitives"
-version = "0.3.1"
+version = "0.3.10"
 dependencies = [
  "dojo",
 ]
diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock
@@ -18,3 +18,4 @@ dependencies = [
 [[package]]
 name = "dojo_plugin"
 version = "0.3.10"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.3.10#be1676252c41f8188465741edcbcb381d2c12080"