From 282f3242750c230cb73429b0000be85d4933eee1 Mon Sep 17 00:00:00 2001
From: Chuck Grindel <chuck.grindel@gmail.com>
Date: Tue, 19 Dec 2023 09:08:39 -0700
Subject: [PATCH] Remove redundant Bazel configuration names.

---
 .bazelrc.common                   | 4 ----
 .github/workflows/patch-test.yaml | 4 ++--
 .github/workflows/workflow.yaml   | 8 ++++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.bazelrc.common b/.bazelrc.common
index 18cb9ca73..1f2025ec3 100644
--- a/.bazelrc.common
+++ b/.bazelrc.common
@@ -86,10 +86,6 @@ build:ci-windows-bindist --experimental_build_event_upload_max_retries=256
 
 test:ci-common --test_output=errors
 
-build:ci-linux-bindist --config=linux-bindist
-build:ci-linux-nixpkgs --config=linux-nixpkgs
-build:ci-macos-bindist --config=macos-bindist
-build:ci-macos-nixpkgs --config=macos-nixpkgs
 build:ci-windows-bindist --config=windows-bindist
 build:ci-windows-bindist-rules-haskell --config=ci-windows-bindist
 build:ci-windows-bindist-rules-haskell-tests --config=ci-windows-bindist
diff --git a/.github/workflows/patch-test.yaml b/.github/workflows/patch-test.yaml
index 8d053d3cb..465466f4a 100644
--- a/.github/workflows/patch-test.yaml
+++ b/.github/workflows/patch-test.yaml
@@ -60,8 +60,8 @@ jobs:
           # See https://github.com/tweag/rules_haskell/issues/1498 and https://github.com/tweag/rules_haskell/pull/1692.
           [[ ${{ runner.os }} == Linux ]] && sudo sysctl -w net.ipv4.tcp_keepalive_time=60
           case ${{ runner.os }} in
-            macOS) BUILD_CONFIG=ci-macos-bindist;;
-            Linux) BUILD_CONFIG=ci-linux-bindist;;
+            macOS) BUILD_CONFIG=macos-bindist;;
+            Linux) BUILD_CONFIG=linux-bindist;;
             Windows) BUILD_CONFIG=ci-windows-bindist;;
           esac
           cat >.bazelrc.local <<EOF
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index e0f51dd80..baf11752a 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -89,8 +89,8 @@ jobs:
       - name: Configure
         run: |
           case ${{ runner.os }} in
-            macOS) BUILD_CONFIG=ci-macos-nixpkgs;;
-            Linux) BUILD_CONFIG=ci-linux-nixpkgs;;
+            macOS) BUILD_CONFIG=macos-nixpkgs;;
+            Linux) BUILD_CONFIG=linux-nixpkgs;;
           esac
           cat >>.bazelrc.local <<EOF
           common --config=ci
@@ -198,8 +198,8 @@ jobs:
         shell: bash
         run: |
           case "${{ runner.os }},${{ matrix.module }}" in
-            macOS,*) BUILD_CONFIG=ci-macos-bindist;;
-            Linux,*) BUILD_CONFIG=ci-linux-bindist;;
+            macOS,*) BUILD_CONFIG=macos-bindist;;
+            Linux,*) BUILD_CONFIG=linux-bindist;;
             Windows,rules_haskell) BUILD_CONFIG=ci-windows-bindist-rules-haskell;;
             Windows,rules_haskell_tests) BUILD_CONFIG=ci-windows-bindist-rules-haskell-tests;;
           esac