Merge branch 'dev' into perekopskiy-zks-107-implement-the-verify-proo…

…f-method-for

.github/bors.toml

@@ -0,0 +1,3 @@
+status = ["ci-all"]
+delete_merged_branches = true
+update_base_for_deletes = true

.github/workflows/ci.yml

@@ -2,8 +2,10 @@ name: CI
 
 on:
   pull_request:
+  push:
     branches:
-     - '*'
+    - staging
+    - trying
 
 jobs:
   ci-all:
@@ -42,10 +44,9 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: update-deps
-      # Upstream version of sqlx-cli has some incompatibilities with the sqlx version used zksync_storage.
       run: |
         rustup update stable
-        cargo install sqlx-cli --git https://github.com/alekseysidorov/sqlx.git
+        cargo install --version=0.2.0 sqlx-cli
         cargo install diesel_cli --no-default-features --features postgres
         docker pull matterlabs/ci-integration-test:zk-latest
 

.github/workflows/promote-stage.yml

@@ -21,7 +21,7 @@ jobs:
 
     - name: init
       run: |
-        cargo sqlx --version || cargo install --version=0.1.0-beta.1 sqlx-cli
+        cargo sqlx --version || cargo install --version=0.2.0 sqlx-cli
         zk
         zk run yarn
         cp etc/tokens/{test,localhost}.json