feat: fixing cicd.

movementlabsxyz · Jan 28, 2024 · 9f95306 · 9f95306
1 parent 28fd6af
commit 9f95306
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 134 deletions.
diff --git a/.github/actions/setup-linux-aarch64/action.yml b/.github/actions/setup-linux-aarch64/action.yml
@@ -23,4 +23,4 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
diff --git a/.github/actions/setup-linux-x86_64/action.yml b/.github/actions/setup-linux-x86_64/action.yml
@@ -23,4 +23,4 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
diff --git a/.github/actions/setup-macos-aarch64/action.yml b/.github/actions/setup-macos-aarch64/action.yml
@@ -24,7 +24,7 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
 
     - name: Export LLVM path
       run: echo "LLVM_SYS_130_PREFIX=$(brew --prefix llvm)" >> $GITHUB_ENV
diff --git a/.github/actions/setup-macos-x86_64/action.yml b/.github/actions/setup-macos-x86_64/action.yml
@@ -24,7 +24,7 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
 
     - name: Export LLVM path
       run: echo "LLVM_SYS_130_PREFIX=$(brew --prefix llvm)" >> $GITHUB_ENV
diff --git a/.github/actions/setup-windows-x86_64/action.yml b/.github/actions/setup-windows-x86_64/action.yml
@@ -23,4 +23,4 @@ runs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.70
+        toolchain: 1.73
diff --git a/movement-sdk/artifacts/src/known_artifacts/m1/testnet.rs b/movement-sdk/artifacts/src/known_artifacts/m1/testnet.rs
@@ -45,7 +45,8 @@ impl ConstructorOperations for Constructor {
             "testnet".to_string(),
             r#"
             echo $MOVEMENT_DIR
-            cp $MOVEMENT_DIR/bin/subnet $MOVEMENT_DIR/bin/$(cat $MOVEMENT_DIR/rsc/testnet-vmid)
+            mkdir -p $MOVEMENT_DIR/avalanchego/plugins
+            cp $MOVEMENT_DIR/bin/subnet $MOVEMENT_DIR/avalanchego/plugins/$(cat $MOVEMENT_DIR/rsc/testnet-vmid)
             "#.to_string(),
         ).with_dependencies(vec![
             avalanche.into(),

diff --git a/movement-sdk/artifacts/src/known_artifacts/third_party/avalanche/avalanchego.rs b/movement-sdk/artifacts/src/known_artifacts/third_party/avalanche/avalanchego.rs
@@ -21,9 +21,12 @@ impl ConstructorOperations for Constructor {
             "cargo".to_string(),
             r#"
 
+            mkdir -p $MOVEMENT_DIR/workspace
+            cd $MOVEMENT_DIR/workspace
             mkdir -p $MOVEMENT_DIR/bin
             git clone git@github.com:ava-labs/avalanchego.git
             cd avalanchego
+            git checkout tags/v1.10.12
             ./scripts/build.sh
 
             mkdir -p $HOME/bin
@@ -43,7 +46,7 @@ impl ConstructorOperations for Constructor {
                 git::Constructor::default().into(),
             ].into_iter().collect()
         ).with_checker(
-            Checker::command_exists("avalanchego".to_string())
+            Checker::Noop
         )
     }
 

diff --git a/movement-sdk/services/src/m1/testnet.rs b/movement-sdk/services/src/m1/testnet.rs
@@ -29,7 +29,7 @@ impl ConstructorOperations for Constructor {
             r#"
             set -e
             echo $MOVEMENT_DIR
-            $MOVEMENT_DIR/bin/avalanchego --network-id=fuji --track-subnets=$(cat $MOVEMENT_DIR/rsc/testnet-vmid)
+            $MOVEMENT_DIR/bin/avalanchego --network-id=fuji --track-subnets=$(cat $MOVEMENT_DIR/rsc/testnet-id) --plugin-dir=$MOVEMENT_DIR/avalanchego/plugins
             "#.to_string(), 
             vec![
                 testnet::Constructor::default_with_version(

diff --git a/movement-sdk/util/util/src/util/artifact/artifact.rs b/movement-sdk/util/util/src/util/artifact/artifact.rs
@@ -335,6 +335,18 @@ impl Artifact {
         }
     }
 
+    pub fn pessimistic_bin_release(name : String, release : Release) -> Self {
+        Self {
+            known_artifact : KnownArtifact::Name(name.clone()),
+            release,
+            location : PathBuf::from("bin").join(name.clone()).into(),
+            version : Version::Latest,
+            builder : Builder::Release(builder::release::Release::new()),
+            checker : Checker::command_exists(name),
+            dependencies : BTreeSet::new()
+        }
+    }
+
     pub fn with_checker(mut self, checker : Checker) -> Self {
         self.checker = checker;
         self

diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/cli/cli.rs b/movement-sdk/util/util/src/util/artifact/artifacts/cli/cli.rs
diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/cli/mod.rs b/movement-sdk/util/util/src/util/artifact/artifacts/cli/mod.rs
diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/m1/mod.rs b/movement-sdk/util/util/src/util/artifact/artifacts/m1/mod.rs
diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/m1/source.rs b/movement-sdk/util/util/src/util/artifact/artifacts/m1/source.rs
diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/m1/source_with_submodules.rs b/movement-sdk/util/util/src/util/artifact/artifacts/m1/source_with_submodules.rs
diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/m1/subnet.rs b/movement-sdk/util/util/src/util/artifact/artifacts/m1/subnet.rs
diff --git a/movement-sdk/util/util/src/util/artifact/artifacts/mod.rs b/movement-sdk/util/util/src/util/artifact/artifacts/mod.rs