Merge pull request #1262 from matter-labs/slumber-zks-136-update-sqlx

Bump sqlx version
aniann · Dec 21, 2020 · 4736063 · 4736063
2 parents d382b79 + 03b29f1
commit 4736063
Show file tree

Hide file tree

Showing 23 changed files with 201 additions and 101 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,10 +42,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
 

diff --git a/.github/workflows/promote-stage.yml b/.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