pin toolchain version to RUSTC_VERSION: 1.70.0 instead of stable (#1748)

* chore: Include "x-dozer-server-name" in response header * chore: add snowflake docker image release flow * chore: edit kafka feature with snowflake docker image release flow * pin Rustup toolchain version to RUSTUP_TOOLCHAIN_VERSION: 1.25.2 instead of stable * pin Rustup toolchain version to RUSTUP_TOOLCHAIN_VERSION: 1.25.2 instead of stable * pin Rustup toolchain version to RUSTUP_TOOLCHAIN_VERSION: 1.25.2 instead of stable * pin Rustup toolchain version to RUSTC_VERSION: 1.70.0 instead of stable * fix lint * fix aarch64 rustup target * fix lint --------- Co-authored-by: chubei <914745487@qq.com>
getdozer · Jul 14, 2023 · eba9ab9 · eba9ab9
1 parent a185133
commit eba9ab9
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -8,6 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUSTC_VERSION: 1.70.0
 
 concurrency:
   group: coverage/${{ github.head_ref || github.run_id }}
@@ -61,7 +62,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           components: llvm-tools-preview
 
       - name: Download grcov

diff --git a/.github/workflows/dozer-log-js.yml b/.github/workflows/dozer-log-js.yml
@@ -8,6 +8,9 @@ on:
       - '*'
   workflow_dispatch:
 
+env:
+  RUSTC_VERSION: 1.70.0
+
 concurrency:
   group: dozer-log-js/${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -76,7 +79,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           target: ${{ matrix.rustup_target }}
 
       - uses: ./.github/actions/release-dozer-log-js
@@ -117,7 +120,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           target: ${{ matrix.rustup_target }}
 
       - uses: ./.github/actions/release-dozer-log-js
@@ -157,7 +160,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           target: ${{ matrix.rustup_target }}
 
       - uses: ./.github/actions/release-dozer-log-js

diff --git a/.github/workflows/dozer.yaml b/.github/workflows/dozer.yaml
@@ -7,6 +7,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUSTC_VERSION: 1.70.0
 
 concurrency:
   group: ci/${{ github.ref }}
@@ -25,7 +26,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           components: rustfmt, clippy
 
       - name: Install Protoc

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -9,6 +9,7 @@ on:
 env:
   CARGO_TERM_COLOR: always
   DOZER_DEV: ci
+  RUSTC_VERSION: 1.70.0
 
 concurrency:
   group: e2e/${{ github.head_ref || github.run_id }}
@@ -35,7 +36,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v1

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -11,6 +11,7 @@ env:
   ECR_REPOSITORY: dozer
   DOCKERHUB_REGISTRY: getdozer
   DOCKERHUB_REPOSITORY: dozer
+  RUSTC_VERSION: 1.70.0
 
 permissions:
   id-token: write # This is required for requesting the JWT
@@ -86,7 +87,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           target: ${{ matrix.target }}
           components: rustfmt, clippy
       - name: APT update
@@ -124,6 +125,7 @@ jobs:
           echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config
           echo 'linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config
           echo 'JEMALLOC_SYS_WITH_LG_PAGE=16' >> $GITHUB_ENV
+          rustup target add aarch64-unknown-linux-gnu
       - name: Cargo build
         uses: actions-rs/cargo@v1
         with:
@@ -215,7 +217,7 @@ jobs:
       - name: Installing Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           profile: minimal
           target: ${{ matrix.target }}
           override: true
@@ -316,7 +318,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: ${{ env.RUSTC_VERSION }}
           target: ${{ matrix.target }}
           components: rustfmt, clippy
       - name: Install Protoc

diff --git a/dozer-sql/src/pipeline/expression/tests/logical.rs b/dozer-sql/src/pipeline/expression/tests/logical.rs
@@ -54,13 +54,13 @@ fn _test_bool_bool_and(bool1: bool, bool2: bool) {
     let row = Record::new(None, vec![]);
     let l = Box::new(Literal(Field::Boolean(bool1)));
     let r = Box::new(Literal(Field::Boolean(bool2)));
-    let _ans = bool1 & bool2;
-
-    assert!(matches!(
-        evaluate_and(&Schema::empty(), &l, &r, &row)
-            .unwrap_or_else(|e| panic!("{}", e.to_string())),
-        Field::Boolean(_ans)
-    ));
+    assert!(
+        matches!(
+            evaluate_and(&Schema::empty(), &l, &r, &row)
+                .unwrap_or_else(|e| panic!("{}", e.to_string())),
+            Field::Boolean(_ans)
+        )
+    );
 }
 
 fn _test_bool_null_and(f1: Field, f2: Field) {