Skip to content

Commit 524dba4

Browse files
prednazprednaz
committed
try-import .bazelrc.* files everywhere
1 parent d63bfde commit 524dba4

18 files changed

+81
-23
lines changed

‎.github/workflows/workflow.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ jobs:
9797
build --config=$BUILD_CONFIG
9898
common --enable_bzlmod=${{ matrix.bzlmod }}
9999
EOF
100-
cp .bazelrc.local rules_haskell_nix
101-
cp .bazelrc.local rules_haskell_tests
102100
- name: Build & test - rules_haskell
103101
if: matrix.module == 'rules_haskell'
104102
uses: tweag/run-nix-shell@v0
@@ -208,7 +206,6 @@ jobs:
208206
$bzlmod_cache_silo_key
209207
common --enable_bzlmod=${{ matrix.bzlmod }}
210208
EOF
211-
cp .bazelrc.local rules_haskell_tests
212209
- name: Build & test - rules_haskell
213210
if: matrix.module == 'rules_haskell'
214211
shell: bash

‎examples/.bazelrc

-1
This file was deleted.

‎examples/.bazelrc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import %workspace%/../.bazelrc.common
2+
import %workspace%/../.bazelrc.bzlmod
3+
4+
# Remote Cache Authentication
5+
# ---------------------------
6+
try-import %workspace%/../.bazelrc.auth
7+
8+
# User Configuration
9+
# ------------------
10+
try-import %workspace%/../.bazelrc.local

‎examples/.bazelrc.bzlmod

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
# Disable bzlmod explicitly by default, see https://github.com/tweag/rules_haskell/issues/1977
2+
common --noenable_bzlmod
3+
14
common:bzlmod --enable_bzlmod
2-
common:common --registry=file://%workspace%/../registry --registry=https://bcr.bazel.build
5+
# Note, have to use /// to make Bazel not crash on Windows
6+
common:common --registry=file:///%workspace%/../registry --registry=https://bcr.bazel.build
7+

‎examples/.bazelrc.common

-1
This file was deleted.

‎examples/.bazelrc.local

-1
This file was deleted.

‎examples/arm/.bazelrc

-1
This file was deleted.

‎examples/arm/.bazelrc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import %workspace%/../../.bazelrc.common
2+
import %workspace%/../../.bazelrc.bzlmod
3+
4+
# Remote Cache Authentication
5+
# ---------------------------
6+
try-import %workspace%/../../.bazelrc.auth
7+
8+
# User Configuration
9+
# ------------------
10+
try-import %workspace%/../../.bazelrc.local

‎examples/arm/.bazelrc.bzlmod

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
common:bzlmod --experimental_enable_bzlmod
2-
common:bzlmod --registry=file://%workspace%/../../registry --registry=https://bcr.bazel.build
1+
# Disable bzlmod explicitly by default, see https://github.com/tweag/rules_haskell/issues/1977
2+
common --noenable_bzlmod
3+
4+
common:bzlmod --enable_bzlmod
5+
# Note, have to use /// to make Bazel not crash on Windows
6+
common:common --registry=file:///%workspace%/../../registry --registry=https://bcr.bazel.build
7+

‎examples/arm/.bazelrc.common

-1
This file was deleted.

‎rules_haskell_nix/.bazelrc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import %workspace%/../.bazelrc.common
2-
import %workspace%/.bazelrc.bzlmod
2+
import %workspace%/../.bazelrc.bzlmod
3+
4+
# Remote Cache Authentication
5+
# ---------------------------
6+
try-import %workspace%/../.bazelrc.auth
37

48
# User Configuration
59
# ------------------
6-
try-import %workspace%/.bazelrc.local
10+
try-import %workspace%/../.bazelrc.local

‎rules_haskell_nix/.bazelrc.bzlmod

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
common:bzlmod --enable_bzlmod
1+
# Disable bzlmod explicitly by default, see https://github.com/tweag/rules_haskell/issues/1977
2+
common --noenable_bzlmod
23

4+
common:bzlmod --enable_bzlmod
35
# Note, have to use /// to make Bazel not crash on Windows
46
common:common --registry=file:///%workspace%/../registry --registry=https://bcr.bazel.build
7+

‎rules_haskell_tests/.bazelrc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import %workspace%/../.bazelrc.common
2-
import %workspace%/.bazelrc.bzlmod
2+
import %workspace%/../.bazelrc.bzlmod
3+
4+
# Remote Cache Authentication
5+
# ---------------------------
6+
try-import %workspace%/../.bazelrc.auth
37

48
# User Configuration
59
# ------------------
6-
try-import %workspace%/.bazelrc.local
10+
try-import %workspace%/../.bazelrc.local

‎rules_haskell_tests/.bazelrc.bzlmod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
common --noenable_bzlmod
33

44
common:bzlmod --enable_bzlmod
5-
65
# Note, have to use /// to make Bazel not crash on Windows
76
common:common --registry=file:///%workspace%/../registry --registry=https://bcr.bazel.build
7+

‎rules_haskell_tests/tests/bzlmod_runfiles/other_module/.bazelrc

+8
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
import %workspace%/../../../../.bazelrc.common
22
import %workspace%/.bazelrc.bzlmod
3+
4+
# Remote Cache Authentication
5+
# ---------------------------
6+
try-import %workspace%/../../../../.bazelrc.auth
7+
8+
# User Configuration
9+
# ------------------
10+
try-import %workspace%/../../../../.bazelrc.local

‎rules_haskell_tests/tests/bzlmod_runfiles/other_module/.bazelrc.bzlmod

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1-
common:bzlmod --experimental_enable_bzlmod
2-
common:bzlmod --registry=file:%workspace%/../../../../registry --registry=https://bcr.bazel.build
1+
# Disable bzlmod explicitly by default, see https://github.com/tweag/rules_haskell/issues/1977
2+
common --noenable_bzlmod
3+
4+
common:bzlmod --enable_bzlmod
5+
# Note, have to use /// to make Bazel not crash on Windows
6+
common:common --registry=file:///%workspace%/../../../../registry --registry=https://bcr.bazel.build
7+

‎tutorial/.bazelrc

-1
This file was deleted.

‎tutorial/.bazelrc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import %workspace%/../.bazelrc.common
2+
import %workspace%/../.bazelrc.bzlmod
3+
4+
# Remote Cache Authentication
5+
# ---------------------------
6+
try-import %workspace%/../.bazelrc.auth
7+
8+
# User Configuration
9+
# ------------------
10+
try-import %workspace%/../.bazelrc.local

‎tutorial/.bazelrc.bzlmod

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
# Disable bzlmod explicitly by default, see https://github.com/tweag/rules_haskell/issues/1977
2+
common --noenable_bzlmod
3+
14
common:bzlmod --enable_bzlmod
2-
common:common --registry=file://%workspace%/../registry --registry=https://bcr.bazel.build
5+
# Note, have to use /// to make Bazel not crash on Windows
6+
common:common --registry=file:///%workspace%/../registry --registry=https://bcr.bazel.build
7+

‎tutorial/.bazelrc.common

-1
This file was deleted.

‎tutorial/.bazelrc.local

-1
This file was deleted.

0 commit comments

Comments
 (0)