Skip to content

Commit 84eab85

Browse files
authored
Improve docker image for RBE and re-enable RBE on main (TraceMachina#1326)
1 parent 3d8766f commit 84eab85

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ jobs:
2020
runs-on: ubuntu-22.04
2121
environment: production
2222
name: NativeLink.com Cloud / RBE on Main (Legacy Dockerfile Test)
23-
if: false
24-
# github.ref == 'refs/heads/main'
23+
if: github.ref == 'refs/heads/main'
2524
steps:
2625
- name: Checkout
2726
uses: >- # v4.1.1
2827
actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
2928
3029
- name: Set up AWS CLI
31-
uses: aws-actions/configure-aws-credentials@v1
30+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502
3231
with:
3332
aws-access-key-id: ${{ secrets.RBE_ECR_AWS_ACCESS_KEY_ID }}
3433
aws-secret-access-key: ${{ secrets.RBE_ECR_AWS_SECRET_ACCESS_KEY }}
@@ -51,8 +50,9 @@ jobs:
5150

5251
- name: Run Bazel tests
5352
shell: bash
53+
# remove digest_function when #1325 is resolved
5454
run: |
55-
bazel test \
55+
bazel --digest_function=sha256 test \
5656
--remote_cache=grpcs://cas-tracemachina-shared.build-faster.nativelink.net \
5757
--remote_header=x-nativelink-api-key=${{ secrets.NATIVELINK_COM_API_HEADER }} \
5858
--remote_instance_name=main \

tools/toolchain-nativelink/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
3030
&& rm -rf /var/lib/apt/lists/*
3131

3232
# Get Rust
33-
RUN curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.79.0
33+
RUN curl --proto "=https" --tlsv1.2 -sSf https://raw.githubusercontent.com/rust-lang/rustup/54dd3d00fd20e64dc522517a0d7be4285570a2f1/rustup-init.sh | sh -s -- -y --default-toolchain=1.79.0
3434

3535
RUN echo "source \"$HOME/.cargo/env\"" >> "$HOME/.bashrc"

0 commit comments

Comments
 (0)