From 56ebee91bc82676bdf993aa5e6c5e219a08f1b02 Mon Sep 17 00:00:00 2001 From: Igor Sarkisov Date: Thu, 2 May 2024 15:35:23 -0700 Subject: [PATCH] User default runner account --- .github/workflows/docker-build.yml | 28 ++++------------------------ docker/linux/Dockerfile | 5 +---- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 529dcecbc952a4..a42ebf22174ff0 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -43,7 +43,7 @@ jobs: DEPOT_TOOLS_METRICS: 0 SCCACHE: 1 SCCACHE_GCS_BUCKET: cobalt-actions-sccache-linux - SCCACHE_GCS_OAUTH_URL: http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/token + SCCACHE_GCS_SERVICE_ACCOUNT: runner@cobalt-actions-devel.iam.gserviceaccount.com SCCACHE_GCS_RW_MODE: READ_WRITE SCCACHE_IDLE_TIMEOUT: 0 # prevent sccache server from shutting down after long idle. @@ -59,11 +59,7 @@ jobs: - name: Add directory to PATH run: echo "$GITHUB_WORKSPACE/depot_tools" >> $GITHUB_PATH - name: Generate gclient file - run: | - whoami - gclient config --help - gclient sync --help - gclient config --name=src https://github.com/${{ github.repository }} + run: gclient config --name=src https://github.com/${{ github.repository }} - name: Gclient sync run: gclient sync -v --shallow --no-history -r ${{ github.sha }} - name: DF @@ -76,26 +72,10 @@ jobs: run: | cd src gn gen out/Default --args='cc_wrapper="sccache"' - - name: ninja base_unittests - run: | - cd src - ninja -C out/Default base_unittests - - name: ninja sql_unittests - run: | - cd src - ninja -C out/Default sql_unittests - - name: ninja net_unittests - run: | - cd src - ninja -C out/Default net_unittests - - name: ninja url_unittests - run: | - cd src - ninja -C out/Default url_unittests - - name: ninja ipc_tests + - name: ninja default run: | cd src - ninja -C out/Default ipc_tests + ninja -C out/Default default - name: sccache check run: sccache -s - name: Any speed diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index e5a48859eb806b..f7bed0e8ac3cb3 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -15,7 +15,4 @@ ADD files/sccache /usr/local/bin ENV SCCACHE_GCS_BUCKET=githubactions-chrome-sccache ENV SCCACHE_GCS_RW_MODE=READ_WRITE ENV SCCACHE_GCS_KEY_PATH=/root/key.json -# ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com - -USER chrobalt -ENV HOME /home/chrobalt +ENV SCCACHE_GCS_SERVICE_ACCOUNT=github-actions-bucket-access@cobalt-demo-330821.iam.gserviceaccount.com