Skip to content

Commit 282f324

Browse files
committed
Remove redundant Bazel configuration names.
1 parent 1b476c3 commit 282f324

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

.bazelrc.common

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ build:ci-windows-bindist --experimental_build_event_upload_max_retries=256
8686

8787
test:ci-common --test_output=errors
8888

89-
build:ci-linux-bindist --config=linux-bindist
90-
build:ci-linux-nixpkgs --config=linux-nixpkgs
91-
build:ci-macos-bindist --config=macos-bindist
92-
build:ci-macos-nixpkgs --config=macos-nixpkgs
9389
build:ci-windows-bindist --config=windows-bindist
9490
build:ci-windows-bindist-rules-haskell --config=ci-windows-bindist
9591
build:ci-windows-bindist-rules-haskell-tests --config=ci-windows-bindist

.github/workflows/patch-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
# See https://github.com/tweag/rules_haskell/issues/1498 and https://github.com/tweag/rules_haskell/pull/1692.
6161
[[ ${{ runner.os }} == Linux ]] && sudo sysctl -w net.ipv4.tcp_keepalive_time=60
6262
case ${{ runner.os }} in
63-
macOS) BUILD_CONFIG=ci-macos-bindist;;
64-
Linux) BUILD_CONFIG=ci-linux-bindist;;
63+
macOS) BUILD_CONFIG=macos-bindist;;
64+
Linux) BUILD_CONFIG=linux-bindist;;
6565
Windows) BUILD_CONFIG=ci-windows-bindist;;
6666
esac
6767
cat >.bazelrc.local <<EOF

.github/workflows/workflow.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ jobs:
8989
- name: Configure
9090
run: |
9191
case ${{ runner.os }} in
92-
macOS) BUILD_CONFIG=ci-macos-nixpkgs;;
93-
Linux) BUILD_CONFIG=ci-linux-nixpkgs;;
92+
macOS) BUILD_CONFIG=macos-nixpkgs;;
93+
Linux) BUILD_CONFIG=linux-nixpkgs;;
9494
esac
9595
cat >>.bazelrc.local <<EOF
9696
common --config=ci
@@ -198,8 +198,8 @@ jobs:
198198
shell: bash
199199
run: |
200200
case "${{ runner.os }},${{ matrix.module }}" in
201-
macOS,*) BUILD_CONFIG=ci-macos-bindist;;
202-
Linux,*) BUILD_CONFIG=ci-linux-bindist;;
201+
macOS,*) BUILD_CONFIG=macos-bindist;;
202+
Linux,*) BUILD_CONFIG=linux-bindist;;
203203
Windows,rules_haskell) BUILD_CONFIG=ci-windows-bindist-rules-haskell;;
204204
Windows,rules_haskell_tests) BUILD_CONFIG=ci-windows-bindist-rules-haskell-tests;;
205205
esac

0 commit comments

Comments
 (0)