Merge #2249

2249: [ci] switch gcs sa.json to gha secrets r=Deniallugo a=dennybaa Signed-off-by: Denis Baryshev <[email protected]> Co-authored-by: Denis Baryshev <[email protected]>
versace717 · May 19, 2022 · 036f627 · 036f627
2 parents 89bcef2 + a110f8e
commit 036f627
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,9 @@ jobs:
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          ## Setup sccache GCS key (update docker-compose .env)
+          SCCACHE_TEMP=$(echo `mktemp -d`)/sa_key.json; echo $SCCACHE_CGS_KEY > $SCCACHE_TEMP
+          echo "HOST_GCS_KEY_PATH=$SCCACHE_TEMP" >> .env
 
       - name: start-services
         run: |
@@ -46,6 +49,9 @@ jobs:
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          ## Setup sccache GCS key (update docker-compose .env)
+          SCCACHE_TEMP=$(echo `mktemp -d`)/sa_key.json; echo $SCCACHE_CGS_KEY > $SCCACHE_TEMP
+          echo "HOST_GCS_KEY_PATH=$SCCACHE_TEMP" >> .env
 
       - name: start-services
         run: |
@@ -88,6 +94,9 @@ jobs:
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          ## Setup sccache GCS key (update docker-compose .env)
+          SCCACHE_TEMP=$(echo `mktemp -d`)/sa_key.json; echo $SCCACHE_CGS_KEY > $SCCACHE_TEMP
+          echo "HOST_GCS_KEY_PATH=$SCCACHE_TEMP" >> .env
 
       - name: start-services
         run: |
@@ -145,6 +154,9 @@ jobs:
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          ## Setup sccache GCS key (update docker-compose .env)
+          SCCACHE_TEMP=$(echo `mktemp -d`)/sa_key.json; echo $SCCACHE_CGS_KEY > $SCCACHE_TEMP
+          echo "HOST_GCS_KEY_PATH=$SCCACHE_TEMP" >> .env
 
       - name: start-services
         run: |
@@ -173,6 +185,9 @@ jobs:
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
           echo PLUGIN_CONFIG=fast >> $GITHUB_ENV # use fast mode for geth image (instant tx commit)
+          ## Setup sccache GCS key (update docker-compose .env)
+          SCCACHE_TEMP=$(echo `mktemp -d`)/sa_key.json; echo $SCCACHE_CGS_KEY > $SCCACHE_TEMP
+          echo "HOST_GCS_KEY_PATH=$SCCACHE_TEMP" >> .env
 
       - name: start-services
         run: |
@@ -201,6 +216,9 @@ jobs:
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          ## Setup sccache GCS key (update docker-compose .env)
+          SCCACHE_TEMP=$(echo `mktemp -d`)/sa_key.json; echo $SCCACHE_CGS_KEY > $SCCACHE_TEMP
+          echo "HOST_GCS_KEY_PATH=$SCCACHE_TEMP" >> .env
 
       - name: start-services
         run: |

diff --git a/docker-compose-runner.yml b/docker-compose-runner.yml
@@ -34,8 +34,8 @@ services:
       - .:/usr/src/zksync
       - /usr/src/cache:/usr/src/cache
       - /usr/src/keys:/usr/src/keys
-      - /etc/sa_secret:/etc/sa_secret
       - /var/run/docker.sock:/var/run/docker.sock
+      - ${HOST_GCS_KEY_PATH:-/etc/sa_secret/sa_key.json}:/etc/sa_secret/sa_key.json
     environment:
       - IN_DOCKER=true
       - CACHE_DIR=/usr/src/cache