refactor: ci and sp_mmr

r0gue-io · Dec 18, 2024 · 855146b · 855146b
1 parent 57bdbcd
commit 855146b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,15 +44,15 @@ jobs:
         run: |
           cargo check --release --locked --features=runtime-benchmarks,try-runtime
 
-  check-ismp:
-    needs: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: "./.github/actions/init"
-      - name: Check Build with ISMP
-        run: |
-          cargo check --release --locked --features=ismp,runtime-benchmarks,try-runtime
+#  check-ismp:
+#    needs: lint
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v4
+#      - uses: "./.github/actions/init"
+#      - name: Check Build with ISMP
+#        run: |
+#          cargo check --release --locked --features=ismp,runtime-benchmarks,try-runtime
 
   clippy:
     needs: lint
@@ -73,24 +73,24 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --release --locked --features=runtime-benchmarks
 
-  clippy-ismp:
-    needs: lint
-    runs-on: ubuntu-latest
-    permissions:
-      checks: write
-    env:
-      RUSTFLAGS: "-Wmissing_docs"
-      SKIP_WASM_BUILD: 1
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: "./.github/actions/init"
-
-      - name: Annotate with Clippy warnings
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --release --locked --features=runtime-benchmarks,ismp
+#  clippy-ismp:
+#    needs: lint
+#    runs-on: ubuntu-latest
+#    permissions:
+#      checks: write
+#    env:
+#      RUSTFLAGS: "-Wmissing_docs"
+#      SKIP_WASM_BUILD: 1
+#    steps:
+#      - uses: actions/checkout@v4
+#
+#      - uses: "./.github/actions/init"
+#
+#      - name: Annotate with Clippy warnings
+#        uses: actions-rs/clippy-check@v1
+#        with:
+#          token: ${{ secrets.GITHUB_TOKEN }}
+#          args: --release --locked --features=runtime-benchmarks,ismp
 
   test:
     needs: lint

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,7 +56,8 @@ jobs:
           
           # if devnet, build the node with ismp feature
           if [ "$RUNTIME" == "devnet" ]; then
-            echo "NODE_BUILD_OPTS=--features on-chain-release-build,ismp" >> $GITHUB_ENV
+#            echo "NODE_BUILD_OPTS=--features on-chain-release-build,ismp" >> $GITHUB_ENV
+            echo "NODE_BUILD_OPTS=--features on-chain-release-build" >> $GITHUB_ENV
           else
             echo "NODE_BUILD_OPTS=--features on-chain-release-build" >> $GITHUB_ENV
           fi

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -132,7 +132,6 @@ sp-genesis-builder = { version = "0.14.0", default-features = false }
 sp-inherents = { version = "33.0.0", default-features = false }
 sp-io = { version = "37.0.0", default-features = false }
 sp-keystore = "0.40.0"
-sp-mmr-primitives = { version = "33.0.0", default-features = false }
 sp-offchain = { version = "33.0.0", default-features = false }
 sp-runtime = { version = "38.0.0", default-features = false }
 sp-session = { version = "34.0.0", default-features = false }
@@ -191,6 +190,8 @@ paseo-runtime-constants = { git = "https://github.com/polkadot-fellows/runtimes"
 # paseo-runtime = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
 # paseo-runtime-constants = { git = "https://github.com/paseo-network/runtimes/", tag = "v1.2.5-system-chains", default-features = false }
 
+# ISMP
+#sp-mmr-primitives = { version = "33.0.0", default-features = false }
 #ismp = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
 #ismp-parachain = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }
 #ismp-parachain-inherent = { git = "https://github.com/r0gue-io/ismp", branch = "polkadot-v1.14.0", default-features = false }

diff --git a/runtime/devnet/Cargo.toml b/runtime/devnet/Cargo.toml
@@ -62,7 +62,6 @@ sp-core.workspace = true
 sp-genesis-builder.workspace = true
 sp-inherents.workspace = true
 sp-io.workspace = true
-sp-mmr-primitives.workspace = true
 sp-offchain.workspace = true
 sp-runtime.workspace = true
 sp-session.workspace = true
@@ -93,6 +92,7 @@ parachain-info.workspace = true
 parachains-common.workspace = true
 
 ## ISMP
+#sp-mmr-primitives.workspace = true
 #ismp.workspace = true
 #ismp-parachain.workspace = true
 #ismp-parachain-runtime-api.workspace = true