Skip to content

Commit b2baa5f

Browse files
authored
Merge pull request #2088 from tweag/cg/use_write_bazelrc
chore: remove redundant Bazel configuration names
2 parents 300963d + eaba9ce commit b2baa5f

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
@@ -55,8 +55,8 @@ jobs:
5555
# See https://github.com/tweag/rules_haskell/issues/1498 and https://github.com/tweag/rules_haskell/pull/1692.
5656
[[ ${{ runner.os }} == Linux ]] && sudo sysctl -w net.ipv4.tcp_keepalive_time=60
5757
case ${{ runner.os }} in
58-
macOS) BUILD_CONFIG=ci-macos-bindist;;
59-
Linux) BUILD_CONFIG=ci-linux-bindist;;
58+
macOS) BUILD_CONFIG=macos-bindist;;
59+
Linux) BUILD_CONFIG=linux-bindist;;
6060
Windows) BUILD_CONFIG=ci-windows-bindist;;
6161
esac
6262
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
@@ -186,8 +186,8 @@ jobs:
186186
shell: bash
187187
run: |
188188
case "${{ runner.os }},${{ matrix.module }}" in
189-
macOS,*) BUILD_CONFIG=ci-macos-bindist;;
190-
Linux,*) BUILD_CONFIG=ci-linux-bindist;;
189+
macOS,*) BUILD_CONFIG=macos-bindist;;
190+
Linux,*) BUILD_CONFIG=linux-bindist;;
191191
Windows,rules_haskell) BUILD_CONFIG=ci-windows-bindist-rules-haskell;;
192192
Windows,rules_haskell_tests) BUILD_CONFIG=ci-windows-bindist-rules-haskell-tests;;
193193
esac

0 commit comments

Comments
 (0)