Merge pull request #2088 from tweag/cg/use_write_bazelrc

chore: remove redundant Bazel configuration names
tweag · Jan 4, 2024 · b2baa5f · b2baa5f
2 parents 300963d + eaba9ce
commit b2baa5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -55,8 +55,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
@@ -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
@@ -186,8 +186,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