Skip to content

Commit 9bca71e

Browse files
committed
WIP:mac sccache
Change-Id: Ie0ee0d86efca90dfcf2fe02e46ab8a92ddbec62e
1 parent fd59b4c commit 9bca71e

23 files changed

Lines changed: 82 additions & 1293 deletions

.github/actions/build/action.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ runs:
2020
- name: GN gen
2121
run: |
2222
cd cobalt/src
23-
cobalt/build/gn.py -p ${{ matrix.platform }} -C ${{ matrix.config }}
23+
if [[ "${{ matrix.platform }}" == *"mac"* ]]; then
24+
cobalt/build/gn.py -p ${{ matrix.platform }} -C ${{ matrix.config }} --no-rbe --cc_wrapper=sccache
25+
else
26+
cobalt/build/gn.py -p ${{ matrix.platform }} -C ${{ matrix.config }}
27+
fi
2428
shell: bash
2529
- name: List GN args
2630
run: |

.github/actions/depot_tools/action.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,18 @@ runs:
5151
https://github.com/${{ github.repository }}
5252
shell: bash
5353

54-
- name: Set target OS for Android
55-
if: contains(matrix.platform, 'android')
54+
# - name: Set target OS for Android
55+
# if: contains(matrix.platform, 'android')
56+
# run: |
57+
# cd cobalt
58+
# echo "target_os=['android']" >> .gclient
59+
# gclient validate
60+
# shell: bash
61+
62+
- name: Set target OS for Mac
63+
if: ${{ contains(matrix.platform, 'mac') }}
5664
run: |
57-
cd cobalt
58-
echo "target_os=['android']" >> .gclient
65+
echo "target_os=['mac']" >> .gclient
5966
gclient validate
6067
shell: bash
6168

.github/actions/docker/action.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,18 @@ runs:
100100
echo "DOCKER_COMPOSE_IMAGE=${DOCKER_COMPOSE_IMAGE}" >> $GITHUB_ENV
101101
shell: bash
102102

103-
- name: Build and Push Docker Image
104-
if: inputs.is_pr != 'true' || steps.pull-cached-image.outputs.build_image == 'true'
105-
env:
106-
DOCKER_CONTENT_SHA: ${{ inputs.docker_content_sha }}
107-
DOCKER_SERVICE: ${{ inputs.docker_service }}
108-
run: |
109-
# Build and Push Docker Image
110-
set -x
111-
docker compose build ${DOCKER_SERVICE}
103+
# - name: Build and Push Docker Image
104+
# if: inputs.is_pr != 'true' || steps.pull-cached-image.outputs.build_image == 'true'
105+
# env:
106+
# DOCKER_CONTENT_SHA: ${{ inputs.docker_content_sha }}
107+
# DOCKER_SERVICE: ${{ inputs.docker_service }}
108+
# run: |
109+
# # Build and Push Docker Image
110+
# set -x
111+
# docker compose build ${DOCKER_SERVICE}
112112

113-
# The compose build tags the built image with $DOCKER_COMPOSE_IMAGE. Add the Docker content sha and floating tag and push.
114-
docker tag "${DOCKER_COMPOSE_IMAGE}" "${DOCKER_COMPOSE_IMAGE}:${DOCKER_CONTENT_SHA}"
115-
docker tag "${DOCKER_COMPOSE_IMAGE}" "${DOCKER_COMPOSE_IMAGE}:${DOCKER_FLOATING_TAG}"
116-
docker push --all-tags "${DOCKER_COMPOSE_IMAGE}"
117-
shell: bash
113+
# # The compose build tags the built image with $DOCKER_COMPOSE_IMAGE. Add the Docker content sha and floating tag and push.
114+
# docker tag "${DOCKER_COMPOSE_IMAGE}" "${DOCKER_COMPOSE_IMAGE}:${DOCKER_CONTENT_SHA}"
115+
# docker tag "${DOCKER_COMPOSE_IMAGE}" "${DOCKER_COMPOSE_IMAGE}:${DOCKER_FLOATING_TAG}"
116+
# docker push --all-tags "${DOCKER_COMPOSE_IMAGE}"
117+
# shell: bash

.github/config/mac.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"docker_service": "",
3+
"platforms": [
4+
"chromium_mac-arm64"
5+
],
6+
"build_configs": [
7+
"devel"
8+
],
9+
"targets": [
10+
"chromedriver",
11+
"content_shell"
12+
],
13+
"includes": [
14+
{
15+
"name": "mac",
16+
"platform": "chromium_mac-arm64"
17+
}
18+
]
19+
}

.github/workflows/android.yaml

Lines changed: 0 additions & 84 deletions
This file was deleted.

.github/workflows/diff_chromium_branches.yaml

Lines changed: 0 additions & 140 deletions
This file was deleted.

.github/workflows/evergreen.yaml

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)