try-import .bazelrc.* files everywhere

tweag · Feb 22, 2024 · f27bb96 · f27bb96
1 parent d63bfde
commit f27bb96
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 32 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -97,8 +97,6 @@ jobs:
           build --config=$BUILD_CONFIG
           common --enable_bzlmod=${{ matrix.bzlmod }}
           EOF
-          cp .bazelrc.local rules_haskell_nix
-          cp .bazelrc.local rules_haskell_tests
       - name: Build & test - rules_haskell
         if: matrix.module == 'rules_haskell'
         uses: tweag/run-nix-shell@v0
@@ -208,7 +206,6 @@ jobs:
           $bzlmod_cache_silo_key
           common --enable_bzlmod=${{ matrix.bzlmod }}
           EOF
-          cp .bazelrc.local rules_haskell_tests
       - name: Build & test - rules_haskell
         if: matrix.module == 'rules_haskell'
         shell: bash

diff --git a/examples/.bazelrc b/examples/.bazelrc
diff --git a/examples/.bazelrc b/examples/.bazelrc
@@ -0,0 +1,10 @@
+import %workspace%/../.bazelrc.common
+import %workspace%/../.bazelrc.bzlmod
+
+# Remote Cache Authentication
+# ---------------------------
+try-import %workspace%/../.bazelrc.auth
+
+# User Configuration
+# ------------------
+try-import %workspace%/../.bazelrc.local
diff --git a/examples/.bazelrc.bzlmod b/examples/.bazelrc.bzlmod
diff --git a/examples/.bazelrc.common b/examples/.bazelrc.common
diff --git a/examples/.bazelrc.local b/examples/.bazelrc.local
diff --git a/examples/arm/.bazelrc b/examples/arm/.bazelrc
diff --git a/examples/arm/.bazelrc b/examples/arm/.bazelrc
@@ -0,0 +1,10 @@
+import %workspace%/../../.bazelrc.common
+import %workspace%/../../.bazelrc.bzlmod
+
+# Remote Cache Authentication
+# ---------------------------
+try-import %workspace%/../../.bazelrc.auth
+
+# User Configuration
+# ------------------
+try-import %workspace%/../../.bazelrc.local
diff --git a/examples/arm/.bazelrc.bzlmod b/examples/arm/.bazelrc.bzlmod
diff --git a/examples/arm/.bazelrc.common b/examples/arm/.bazelrc.common
diff --git a/rules_haskell_nix/.bazelrc b/rules_haskell_nix/.bazelrc
@@ -1,6 +1,10 @@
 import %workspace%/../.bazelrc.common
-import %workspace%/.bazelrc.bzlmod
+import %workspace%/../.bazelrc.bzlmod
+
+# Remote Cache Authentication
+# ---------------------------
+try-import %workspace%/../.bazelrc.auth
 
 # User Configuration
 # ------------------
-try-import %workspace%/.bazelrc.local
+try-import %workspace%/../.bazelrc.local
diff --git a/rules_haskell_nix/.bazelrc.bzlmod b/rules_haskell_nix/.bazelrc.bzlmod
diff --git a/rules_haskell_tests/.bazelrc b/rules_haskell_tests/.bazelrc
@@ -1,6 +1,10 @@
 import %workspace%/../.bazelrc.common
-import %workspace%/.bazelrc.bzlmod
+import %workspace%/../.bazelrc.bzlmod
+
+# Remote Cache Authentication
+# ---------------------------
+try-import %workspace%/../.bazelrc.auth
 
 # User Configuration
 # ------------------
-try-import %workspace%/.bazelrc.local
+try-import %workspace%/../.bazelrc.local
diff --git a/rules_haskell_tests/.bazelrc.bzlmod b/rules_haskell_tests/.bazelrc.bzlmod
diff --git a/tutorial/.bazelrc b/tutorial/.bazelrc
diff --git a/tutorial/.bazelrc b/tutorial/.bazelrc
@@ -0,0 +1,10 @@
+import %workspace%/../.bazelrc.common
+import %workspace%/../.bazelrc.bzlmod
+
+# Remote Cache Authentication
+# ---------------------------
+try-import %workspace%/../.bazelrc.auth
+
+# User Configuration
+# ------------------
+try-import %workspace%/../.bazelrc.local
diff --git a/tutorial/.bazelrc.bzlmod b/tutorial/.bazelrc.bzlmod
diff --git a/tutorial/.bazelrc.common b/tutorial/.bazelrc.common
diff --git a/tutorial/.bazelrc.local b/tutorial/.bazelrc.local