Skip to content

Commit

Permalink
Revert "Install Starboard clang toolchain" (youtube#4226)
Browse files Browse the repository at this point in the history
Reverts youtube#4219
  • Loading branch information
niranjanyardi authored Oct 8, 2024
1 parent 6d98ce0 commit 2601481
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
15 changes: 0 additions & 15 deletions chrobalt/docker/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,6 @@ RUN apt-get update && apt-get install -y \

ADD files/sccache /usr/local/bin

# === Install pinned host Clang toolchain for all Linux-hosted builds
ARG CLANG_VER

ARG TC_ROOT=${HOME}/starboard-toolchains/
ARG TC_HOME=${TC_ROOT}/x86_64-linux-gnu-clang-chromium-${CLANG_VER}
ARG BASE_URL=https://commondatastorage.googleapis.com/chromium-browser-clang

RUN cd /tmp \
&& mkdir -p ${TC_HOME} \
&& curl --silent -O -J \
${BASE_URL}/Linux_x64/clang-${CLANG_VER}.tgz \
&& tar xf clang-${CLANG_VER}.tgz -C ${TC_HOME} \
&& echo ${CLANG_VER} >> ${TC_HOME}/cr_build_revision \
&& rm clang-${CLANG_VER}.tgz

ENV SCCACHE_GCS_BUCKET=githubactions-chrome-sccache
ENV SCCACHE_GCS_RW_MODE=READ_WRITE
ENV SCCACHE_GCS_KEY_PATH=/root/key.json
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ services:
context: chrobalt/docker/linux
cache_from:
- ghcr.io/youtube/cobalt/linux:latest
args:
- CLANG_VER=${CLANG_VER:-365097-f7e52fbd-8}
image: ghcr.io/youtube/cobalt/linux:latest
platform: linux/amd64
environment:
Expand Down

0 comments on commit 2601481

Please sign in to comment.