From 8255da2d2ca4650ec2170c5cfa304cd2c916555e Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 10 Mar 2023 16:31:54 -0800 Subject: [PATCH] chore: remove unnecessary call to register_coreutils_toolchains() in e2e/coreutils (#393) --- .github/workflows/ci.yaml | 5 ++--- e2e/coreutils/WORKSPACE | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 57de5e3..49a754b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -162,14 +162,13 @@ jobs: rm -Force .aspect/bazelrc/bazel6.bazelrc } - - name: Set bzlmod flag # Store the --enable_bzlmod flag that we add to the test command below # only when we're running bzlmod in our test matrix. id: set_bzlmod_flag if: matrix.bzlmodEnabled run: echo "bzlmod_flag=--enable_bzlmod" >> $GITHUB_OUTPUT - + - name: Write engflow credentials if: ${{ matrix.config == 'rbe' }} working-directory: ${{ matrix.folder }} @@ -206,7 +205,7 @@ jobs: --bazelrc=${{ github.workspace }}/.github/workflows/ci.bazelrc ` --bazelrc=${{ github.workspace }}/.aspect/bazelrc/bazel$BAZEL_MAJOR_VERSION.bazelrc ` --bazelrc=.bazelrc ` - ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }} + ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }} test --config=${{ matrix.config }} //... env: # Bazelisk will download bazel to here diff --git a/e2e/coreutils/WORKSPACE b/e2e/coreutils/WORKSPACE index 4f6c485..880fc92 100644 --- a/e2e/coreutils/WORKSPACE +++ b/e2e/coreutils/WORKSPACE @@ -3,8 +3,6 @@ local_repository( path = "../..", ) -load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "register_coreutils_toolchains") +load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies") aspect_bazel_lib_dependencies() - -register_coreutils_toolchains()