WIP:mac sccache

Change-Id: Ie0ee0d86efca90dfcf2fe02e46ab8a92ddbec62e

Author: SortaCookie

.github/actions/build/action.yaml

@@ -15,16 +15,31 @@ runs:
   steps:
       - name: Clean out dir from previous runner
         run: |
-          rm -rf cobalt/src/out
+          rm -rf src/out
         shell: bash
       - name: GN gen
         run: |
-          cd cobalt/src
-          cobalt/build/gn.py -p ${{ matrix.platform }} -C ${{ matrix.config }}
+          cd src
+          if [[ "${{ matrix.platform }}" == *"mac"* ]]; then
+            cobalt/build/gn.py -p ${{ matrix.platform }} -C ${{ matrix.config }} --no-rbe --cc_wrapper=sccache
+          else
+            cobalt/build/gn.py -p ${{ matrix.platform }} -C ${{ matrix.config }}
+          fi
+        shell: bash
+      - name: Set sccache debug env variable
+        run: |
+          echo "SCCACHE_ERROR_LOG=$HOME/tmp/sccache.log" >> $GITHUB_ENV
+          echo "SCCACHE_LOG=debug" >> $GITHUB_ENV
         shell: bash
-      - name: List GN args
+      - name: List GN args and sccache
         run: |
-          cd cobalt/src
+          cd src
+          echo "$SCCACHE_GCS_KEY_PATH"
+          echo "$SCCACHE"
+          echo "$SCCACHE_GCS_BUCKET"
+          echo "$SCCACHE_GCS_RW_MODE"
+          echo "$SCCACHE_IDLE_TIMEOUT"
+          sccache --show-stats
           gn args --list --short --overrides-only out/${{ matrix.platform }}_${{ matrix.config }}
         shell: bash
       - name: Get list of changed files
@@ -34,7 +49,7 @@ runs:
           CHANGED_FILES_LIST: changed_files.txt
         run: |
           set -x
-          cd cobalt/src
+          cd src
           # GitHub's actions/checkout action, by default, checks out the merge commit when
           # a pull request event triggers a workflow. This merge commit represents the state
           # of the code as if the pull request had been merged into the base branch.
@@ -55,7 +70,7 @@ runs:
           DYN_TEST_TARGETS_JSON_FILE: out/${{ matrix.platform }}_${{ matrix.config }}/dyn_targets.json
         run: |
           set -x
-          cd cobalt/src
+          cd src
 
           if [[ ! -f "${STATIC_TEST_TARGETS_JSON_FILE}" ]]; then
             echo "Static test targets file not found at ${STATIC_TEST_TARGETS_JSON_FILE}. Skipping step."
@@ -95,13 +110,13 @@ runs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}_test_targets_json
-          path: cobalt/src/out/${{ matrix.platform }}_${{ matrix.config }}/test_targets.json
+          path: src/out/${{ matrix.platform }}_${{ matrix.config }}/test_targets.json
       - name: Ninja build test targets
         if: ${{ matrix.config == 'devel' && fromJSON(steps.calculate-test-targets.outputs.test_targets_count || 0) > 0 }}
         id: build-test-targets
         run: |
           set -ex
-          cd cobalt/src
+          cd src
           test_targets=$(echo '${{ steps.calculate-test-targets.outputs.test_targets_json }}' | jq -cr 'join(" ")')
           time autoninja -C out/${{ matrix.platform }}_${{ matrix.config }} ${test_targets}
         shell: bash
@@ -110,7 +125,7 @@ runs:
           TARGETS_JSON: ${{ inputs.targets }}
         run: |
           set -ex
-          cd cobalt/src
+          cd src
           TARGETS=$(echo "${TARGETS_JSON}" | jq -cr '. | join(" ")')
           time autoninja -C out/${{ matrix.platform }}_${{ matrix.config }} ${TARGETS}
         shell: bash
@@ -120,12 +135,12 @@ runs:
         with:
           name: ${{ matrix.platform }} APKs
           path: |
-            cobalt/src/out/${{ matrix.platform }}_qa/apks/*.apk
-            cobalt/src/out/${{ matrix.platform }}_qa/*_apk/*.apk
-            cobalt/src/out/${{ matrix.platform }}_qa/gen/build_info.json
+            src/out/${{ matrix.platform }}_qa/apks/*.apk
+            src/out/${{ matrix.platform }}_qa/*_apk/*.apk
+            src/out/${{ matrix.platform }}_qa/gen/build_info.json
       - name: Upload Test Artifacts
         if: steps.build-test-targets.outcome == 'success'
-        uses: ./cobalt/src/.github/actions/upload_test_artifacts
+        uses: ./src/.github/actions/upload_test_artifacts
         with:
           test_artifacts_key: ${{ inputs.test_artifacts_key }}
           upload_on_host_test_artifacts: ${{ inputs.upload_on_host_test_artifacts == 'true' || inputs.upload_web_test_artifacts == 'true' }}

.github/actions/depot_tools/action.yaml

@@ -17,24 +17,22 @@ runs:
       - name: Clear Cache and Clone Depot Tools
         if: inputs.use_cache != 'true'
         run: |
-          rm -rf /runner-cache/depot_tools /runner-cache/cobalt/.cipd_cache
-          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /runner-cache/depot_tools
-          git -C /runner-cache/cobalt/src clean -ffdx
-        shell: bash
+          # Use $HOME instead of a root / path
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git $HOME/depot_tools
 
-      - name: Reset Cached Depot Tools
-        if: inputs.use_cache == 'true'
-        run: git -C /runner-cache/depot_tools reset --hard origin/main
+          # Add to PATH for subsequent steps
+          echo "$HOME/depot_tools" >> $GITHUB_PATH
         shell: bash
 
-      - name: Add Depot Tools to PATH
-        run: echo "/runner-cache/depot_tools" >> $GITHUB_PATH
-        shell: bash
+      # - name: Reset Cached Depot Tools
+      #   if: inputs.use_cache == 'true'
+      #   run: git -C /runner-cache/depot_tools reset --hard origin/main
+      #   shell: bash
 
       - name: Bootstrap Bundled python3
         run: |
           # Must be run manually as $DEPOT_TOOLS_UPDATE is 0 in CI, skipping the bootstrap.
-          source /runner-cache/depot_tools/bootstrap_python3 && bootstrap_python3
+          source $HOME/depot_tools/bootstrap_python3 && bootstrap_python3
         shell: bash
 
       - name: Disable Chromium client side build telemetry
@@ -43,26 +41,32 @@ runs:
 
       - name: Run gclient config
         run: |
-          cd cobalt
           gclient config \
             --name=src \
             --custom-var=download_remoteexec_cfg=True \
             --custom-var='rbe_instance="${{ inputs.rbe_instance }}"' \
             https://github.com/${{ github.repository }}
         shell: bash
 
-      - name: Set target OS for Android
-        if: contains(matrix.platform, 'android')
+      # - name: Set target OS for Android
+      #   if: contains(matrix.platform, 'android')
+      #   run: |
+      #     cd cobalt
+      #     echo "target_os=['android']" >> .gclient
+      #     gclient validate
+      #   shell: bash
+
+      - name: Set target OS for Mac
+        if: ${{ contains(matrix.platform, 'mac') }}
         run: |
-          cd cobalt
-          echo "target_os=['android']" >> .gclient
+          echo "target_os=['mac']" >> .gclient
           gclient validate
         shell: bash
 
       - name: Run gclient sync
         if: inputs.run_sync == 'true'
         run: |
-          cd cobalt
+          cd src
           gclient sync \
             --verbose \
             --shallow \
@@ -75,9 +79,9 @@ runs:
 
       - name: Run gclient runhooks
         if: inputs.run_sync == 'true'
-        env:
-          CIPD_CACHE_DIR: "/runner-cache/cobalt/.cipd_cache"
+        # env:
+        #   CIPD_CACHE_DIR: "/runner-cache/cobalt/.cipd_cache"
         run: |
-          cd cobalt
+          cd src
           gclient runhooks --verbose
         shell: bash

.github/config/mac.json

@@ -0,0 +1,18 @@
+{
+  "docker_service": "",
+  "platforms": [
+    "chromium_mac-arm64"
+  ],
+  "build_configs": [
+    "devel"
+  ],
+  "targets": [
+    "starboard/nplb:nplb"
+  ],
+  "includes": [
+    {
+      "name": "mac",
+      "platform": "chromium_mac-arm64"
+    }
+  ]
+}