Minor fixes

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       run: |
         rustup update stable
         cargo sqlx --version || cargo install --version=0.1.0-beta.1 sqlx-cli
-        docker pull matterlabs/ci-integration-test:latest
+        docker pull matterlabs/ci-integration-test:zk-latest
 
     - name: zk
       run: zk

bin/zk

@@ -5,5 +5,5 @@ if [ -z "$1" ]; then
     yarn && yarn build
 else
     # can't start this with yarn since it has quirks with `--` as an argument
-    node $ZKSYNC_HOME/infrastructure/zk/build/index.js -- "$@"
+    node $ZKSYNC_HOME/infrastructure/zk/build/index.js "$@"
 fi

docker/exit-tool/exit-tool-entry.sh

@@ -17,6 +17,7 @@ then
   exit 1
 fi
 
+zk
 zk run plonk-setup
 zk run verify-keys unpack
 zk db wait

docker/integration-test/Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /usr/src/zksync
 RUN apt-get update; apt-get install -y make bash git postgresql openssl libssl-dev gcc g++ curl libpq-dev pkg-config software-properties-common jq
 
 # Install node and yarn
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt-get install -y nodejs
 RUN npm install -g yarn
 
@@ -44,3 +44,4 @@ COPY entrypoint.sh /usr/local/bin/
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
 ENV PATH="${ZKSYNC_HOME}/bin:${PATH}"
+ENV CI=1

infrastructure/zk/src/completion.ts

@@ -2,7 +2,6 @@
 // If the completion script is installed, there is no need to update it after adding a new subcommand
 
 import { Command, Option } from 'commander';
-import * as utils from './utils';
 import tabtab from 'tabtab';
 
 type CommandInfo = {
@@ -61,11 +60,6 @@ export function command(program: Command) {
                 name: 'zk',
                 completer: 'zk'
             });
-            utils.replaceInFile(
-                `${process.env.HOME}/.config/tabtab/zk.bash`,
-                'zk completion --',
-                'zk completion'
-            );
         });
 
     completion

infrastructure/zk/src/index.ts

@@ -49,7 +49,7 @@ async function main() {
         .addCommand(completion(program as Command));
 
     // f command is special-cased because it is necessary
-    // that for it to run from $PWD and not from $ZKSYNC_HOME
+    // for it to run from $PWD and not from $ZKSYNC_HOME
     program
         .command('f <command...>')
         .allowUnknownOption()

infrastructure/zk/src/init.ts

@@ -9,9 +9,9 @@ import * as env from './env';
 import { up } from './up';
 
 export async function init() {
-    await checkEnv();
-    await env.gitHooks();
     if (!process.env.CI) {
+        await checkEnv();
+        await env.gitHooks();
         await up();
     }
     await utils.allowFail(run.yarn());

infrastructure/zk/src/test/integration.ts

@@ -85,7 +85,7 @@ export async function inDocker(command: string, timeout: number) {
     timer.unref();
 
     const volume = `${process.env.ZKSYNC_HOME}:/usr/src/zksync`;
-    const image = `matterlabs/ci-integration-test:latest`;
+    const image = `matterlabs/ci-integration-test:zk-latest`;
     await utils.spawn(
         `docker run -v ${volume} ${image} bash -c "/usr/local/bin/entrypoint.sh && ${command} || zk run cat-logs"`
     );