[Deps] Update to Diem 1.6.2 (#155)

* update upstream to diem 1.6.2, and make sure shared crates at at same version and features. * update ci yaml * update deps to 0LNetworkCommunity/libra-framework * refactors for upstream api changes * add rust caching to workflow * run linter on macos, zbus error on ubuntu
0LNetworkCommunity · Sep 14, 2023 · f02bca3 · f02bca3
1 parent 8da6f9e
commit f02bca3
Show file tree

Hide file tree

Showing 21 changed files with 3,372 additions and 3,379 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -6,6 +6,13 @@ on:
       - '*'
     branches:
       - '*'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+    branches:
+      - 'release**'
+      - 'main'
 jobs:
   ts-lint:
     runs-on: ubuntu-latest
@@ -20,9 +27,45 @@ jobs:
       - name: checkout source
         uses: actions/checkout@v3
 
-########  Lint  ########
-
       - name: yarn installation
         run: yarn install
+
       - name: lint TS
-        run: yarn lint
+        run: yarn lint
+
+  rust-lint:
+    runs-on: macos-latest
+    steps:
+      # - uses: awalsh128/cache-apt-pkgs-action@latest
+      #   with:
+      #     packages: build-essential lld pkg-config libclang-dev libwebkit2gtk-4.0-dev libglib2.0-* libssl-dev libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev libvips-dev libgmp-dev
+      #     version: 1.0
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.70.0
+          override: true
+
+      - name: install rustfmt clippy
+        shell: bash
+        run: rustup component add rustfmt clippy
+
+      - name: checkout sources
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: cache rust
+        uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "libra" # to share across CI builds, so it is not job-id specific
+          cache-on-failure: true
+
+      - name: check format
+        working-directory: ./src-tauri
+        run: cargo fmt --all -- --check
+
+      - name: lint
+        working-directory: ./src-tauri
+        run: cargo clippy --workspace --tests -- -D warnings
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -4,7 +4,9 @@ on:
   push:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-canary.[0-9]+'
+
     branches:
       - 'canary'
       - 'ci'