feat(zk_toolbox): Update lint CI with zk_toolbox

.github/workflows/ci-core-lint-reusable.yml

@@ -19,23 +19,22 @@ jobs:
 
       - name: Start services
         run: |
-          mkdir -p ./volumes/postgres
-          run_retried docker compose pull zk postgres
-          docker compose up -d zk postgres
+          ci_localnet_up
           ci_run sccache --start-server
 
-      - name: Setup db
+      - name: Build
         run: |
-          ci_run zk
-          ci_run run_retried rustup show
-          ci_run zk db migrate
+          ci_run bash -c "cd zk_toolbox && cargo build --release"
+          cp ./zk_toolbox/target/release/zk_supervisor ./bin
+          cp ./zk_toolbox/target/release/zk_inception ./bin
+          ci_run bash -c "yarn install"
+          ci_run bash -c "git config --global --add safe.directory /usr/src/zksync"
 
       - name: Lints
         run: |
-          ci_run zk fmt --check
-          ci_run zk lint rust --check
-          ci_run zk lint toolbox --check
-          ci_run zk lint js --check
-          ci_run zk lint ts --check
-          ci_run zk lint md --check
-          ci_run zk db check-sqlx-data
+          ci_run zk_supervisor fmt --check
+          ci_run zk_supervisor lint -e md --check
+          ci_run zk_supervisor lint -e sol --check
+          ci_run zk_supervisor lint -e js --check
+          ci_run zk_supervisor lint -e ts --check
+          ci_run zk_supervisor lint -e rs --check

.github/workflows/ci-zk-toolbox-reusable.yml

@@ -115,6 +115,10 @@ jobs:
           --prover-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
           --prover-db-name=zksync_prover_localhost_rollup
 
+      - name: Check Database
+        run: |
+          ci_run zk_supervisor database check-sqlx-data
+
       - name: Run server
         run: |
           ci_run zk_inception server --ignore-prerequisites &>server.log &

zk_toolbox/crates/zk_supervisor/src/commands/lint.rs

@@ -19,6 +19,8 @@ pub struct LintArgs {
     pub check: bool,
     #[clap(long, short = 'e')]
     pub extensions: Vec<Extension>,
+    #[clap(long, default_missing_value = "true", num_args = 0..=1)]
+    pub contracts: Option<bool>,
 }
 
 pub fn run(shell: &Shell, args: LintArgs) -> anyhow::Result<()> {
@@ -37,15 +39,19 @@ pub fn run(shell: &Shell, args: LintArgs) -> anyhow::Result<()> {
     logger::info(msg_running_linters_for_files(&extensions));
 
     let ecosystem = EcosystemConfig::from_file(shell)?;
+    let contracts = args.contracts.unwrap_or(false);
 
     for extension in extensions {
         match extension {
             Extension::Rs => lint_rs(shell, &ecosystem, args.check)?,
-            Extension::Sol => lint_contracts(shell, &ecosystem, args.check)?,
             ext => lint(shell, &ecosystem, &ext, args.check)?,
         }
     }
 
+    if contracts {
+        lint_contracts(shell, &ecosystem, args.check)?;
+    }
+
     Ok(())
 }
 
@@ -61,14 +67,7 @@ fn lint_rs(shell: &Shell, ecosystem: &EcosystemConfig, check: bool) -> anyhow::R
     for path in paths {
         let _dir_guard = shell.push_dir(path);
         let mut cmd = cmd!(shell, "cargo clippy");
-        let common_args = &[
-            "--locked",
-            "--",
-            "-D",
-            "warnings",
-            "-D",
-            "unstable_features",
-        ];
+        let common_args = &["--locked", "--", "-D", "warnings"];
         if !check {
             cmd = cmd.args(&["--fix", "--allow-dirty"]);
         }
@@ -128,8 +127,6 @@ fn lint(
 }
 
 fn lint_contracts(shell: &Shell, ecosystem: &EcosystemConfig, check: bool) -> anyhow::Result<()> {
-    lint(shell, ecosystem, &Extension::Sol, check)?;
-
     let spinner = Spinner::new(MSG_RUNNING_CONTRACTS_LINTER_SPINNER);
     let _dir_guard = shell.push_dir(&ecosystem.link_to_code);
     let cmd = cmd!(shell, "yarn");