diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37ccb0817..cd9de4128 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,15 +20,14 @@ jobs: runs-on: ubuntu-22.04 environment: production name: NativeLink.com Cloud / RBE on Main (Legacy Dockerfile Test) - if: false - # github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' steps: - name: Checkout uses: >- # v4.1.1 actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Set up AWS CLI - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 with: aws-access-key-id: ${{ secrets.RBE_ECR_AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.RBE_ECR_AWS_SECRET_ACCESS_KEY }} @@ -51,8 +50,9 @@ jobs: - name: Run Bazel tests shell: bash + # remove digest_function when #1325 is resolved run: | - bazel test \ + bazel --digest_function=sha256 test \ --remote_cache=grpcs://cas-tracemachina-shared.build-faster.nativelink.net \ --remote_header=x-nativelink-api-key=${{ secrets.NATIVELINK_COM_API_HEADER }} \ --remote_instance_name=main \ diff --git a/tools/toolchain-nativelink/Dockerfile b/tools/toolchain-nativelink/Dockerfile index 0889e3805..91ac59865 100644 --- a/tools/toolchain-nativelink/Dockerfile +++ b/tools/toolchain-nativelink/Dockerfile @@ -30,6 +30,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal && rm -rf /var/lib/apt/lists/* # Get Rust -RUN curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.79.0 +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 RUN echo "source \"$HOME/.cargo/env\"" >> "$HOME/.bashrc"