@@ -17,24 +17,22 @@ runs:
1717 - name : Clear Cache and Clone Depot Tools
1818 if : inputs.use_cache != 'true'
1919 run : |
20- rm -rf /runner-cache/depot_tools /runner-cache/cobalt/.cipd_cache
21- git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /runner-cache/depot_tools
22- git -C /runner-cache/cobalt/src clean -ffdx
23- shell : bash
20+ # Use $HOME instead of a root / path
21+ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git $HOME/depot_tools
2422
25- - name : Reset Cached Depot Tools
26- if : inputs.use_cache == 'true'
27- run : git -C /runner-cache/depot_tools reset --hard origin/main
23+ # Add to PATH for subsequent steps
24+ echo "$HOME/depot_tools" >> $GITHUB_PATH
2825 shell : bash
2926
30- - name : Add Depot Tools to PATH
31- run : echo "/runner-cache/depot_tools" >> $GITHUB_PATH
32- shell : bash
27+ # - name: Reset Cached Depot Tools
28+ # if: inputs.use_cache == 'true'
29+ # run: git -C /runner-cache/depot_tools reset --hard origin/main
30+ # shell: bash
3331
3432 - name : Bootstrap Bundled python3
3533 run : |
3634 # Must be run manually as $DEPOT_TOOLS_UPDATE is 0 in CI, skipping the bootstrap.
37- source /runner-cache /depot_tools/bootstrap_python3 && bootstrap_python3
35+ source $HOME /depot_tools/bootstrap_python3 && bootstrap_python3
3836 shell : bash
3937
4038 - name : Disable Chromium client side build telemetry
@@ -43,26 +41,34 @@ runs:
4341
4442 - name : Run gclient config
4543 run : |
46- cd cobalt
44+ cd src
4745 gclient config \
4846 --name=src \
4947 --custom-var=download_remoteexec_cfg=True \
5048 --custom-var='rbe_instance="${{ inputs.rbe_instance }}"' \
5149 https://github.com/${{ github.repository }}
5250 shell : bash
5351
54- - name : Set target OS for Android
55- if : contains(matrix.platform, 'android')
52+ # - name: Set target OS for Android
53+ # if: contains(matrix.platform, 'android')
54+ # run: |
55+ # cd cobalt
56+ # echo "target_os=['android']" >> .gclient
57+ # gclient validate
58+ # shell: bash
59+
60+ - name : Set target OS for Mac
61+ if : ${{ contains(matrix.platform, 'mac') }}
5662 run : |
57- cd cobalt
58- echo "target_os=['android ']" >> .gclient
63+ cd src
64+ echo "target_os=['mac ']" >> .gclient
5965 gclient validate
6066 shell : bash
6167
6268 - name : Run gclient sync
6369 if : inputs.run_sync == 'true'
6470 run : |
65- cd cobalt
71+ cd src
6672 gclient sync \
6773 --verbose \
6874 --shallow \
7581
7682 - name : Run gclient runhooks
7783 if : inputs.run_sync == 'true'
78- env :
79- CIPD_CACHE_DIR : " /runner-cache/cobalt/.cipd_cache"
84+ # env:
85+ # CIPD_CACHE_DIR: "/runner-cache/cobalt/.cipd_cache"
8086 run : |
81- cd cobalt
87+ cd src
8288 gclient runhooks --verbose
8389 shell : bash
0 commit comments