Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: remove redundant Bazel configuration names #2088

Merged
merged 2 commits into from
Jan 4, 2024
Merged

chore: remove redundant Bazel configuration names #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
282f324
Remove redundant Bazel configuration names.
cgrindel Dec 19, 2023
eaba9ce
Merge branch 'master' into cg/use_write_bazelrc
mergify[bot] Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .bazelrc.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/patch-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down