include the new zk build code into deploy.stage

Signed-off-by: Denis Baryshev <[email protected]>
Dhenxscode · Feb 22, 2022 · 7e1f7a5 · 7e1f7a5
1 parent 3f21264
commit 7e1f7a5
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/.github/workflows/deploy.stage.yml b/.github/workflows/deploy.stage.yml
@@ -14,7 +14,7 @@ concurrency: deploy-stage
 jobs:
   images:
     name: Build Docker Images
-    runs-on: [self-hosted, MAIN]
+    runs-on: [self-hosted, ci-runner]
     steps:
     - uses: actions/checkout@v2
     -
@@ -23,26 +23,29 @@ jobs:
         echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
         echo CI=1 >> $GITHUB_ENV
         echo $(pwd)/bin >> $GITHUB_PATH
+    -
+      name: start-services
+      run: |
+        docker-compose -f docker-compose-runner.yml down
+        docker-compose -f docker-compose-runner.yml up -d zk postgres
     -
       name: init
       run: |
-        cargo sqlx --version || cargo install sqlx-cli
-        zk
-        zk run yarn
-        cp etc/tokens/{test,localhost}.json
-        zk run verify-keys unpack
-        zk up
-        zk db basic-setup
+        ci_run zk
+        ci_run zk run yarn
+        ci_run cp etc/tokens/{test,localhost}.json
+        ci_run zk run verify-keys unpack
+        ci_run zk db basic-setup
     -
       name: update-images
       run: |
-        docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
-        zk docker push rust
+        ci_run docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
+        ci_run zk docker push rust
     -
       name: docker-down
       if: always()
       run: |
-        docker-compose down
+        docker-compose -f docker-compose-runner.yml down
 
   setup:
     name: Setup