Merge branch 'main' into state_api

pause125 · Jun 9, 2024 · 5113296 · 5113296
2 parents 99a2de5 + 9acee09
commit 5113296
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -41,5 +41,6 @@
 /examples @jolestar @wow-sven @geometryolife
 /examples/blog @wubuku @jolestar
 /sdk @wow-sven @yubing744
-/dashboards @wow-sven @yubing744 @Mine77
+/infra/dashboards @wow-sven @yubing744
+/infra/rooch-portal @wow-sven @TwilightLogic @Mine77
 /docs @wow-sven @geometryolife @Mine77
diff --git a/.github/actions/rust-setup/action.yaml b/.github/actions/rust-setup/action.yaml
@@ -9,7 +9,7 @@ runs:
     - run: sudo apt-get update && sudo apt-get install build-essential ca-certificates clang curl git libpq-dev libssl-dev pkg-config lsof lld --no-install-recommends --assume-yes
       shell: bash
 
-    - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # pin@v1
+    - uses: actions-rs/toolchain@v1.0.6
       with:
         override: true
         components: rustfmt, clippy

diff --git a/rust-toolchain b/rust-toolchain
@@ -0,0 +1 @@
+1.77.1
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+#we keep the `rust-toolchain` and `rust-toolchain.yaml`
+#because some tools dose not support rust-toolchain.yaml yet
+[toolchain]
+channel = "1.77.1"