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.

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

Separate core tests and test with bzlmod enabled #319

Merged
merged 38 commits into from
Feb 10, 2023
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
234143f
Create rules_nixpkgs_core testing module
aherrmann Feb 7, 2023
f2dfc96
Depend on rules_nixpkgs_core
aherrmann Feb 7, 2023
70925fe
Start moving core tests into the testing module
aherrmann Feb 7, 2023
e68b7ba
Move expr-test
aherrmann Feb 7, 2023
0cee772
Update file labels
aherrmann Feb 7, 2023
8677c25
Share nixpkgs repositories in WORKSPACE and bzlmod
aherrmann Feb 7, 2023
a02add7
Enable attribute-test
aherrmann Feb 7, 2023
4f8da4c
expr-attribute-test
aherrmann Feb 7, 2023
8289259
Move tests into tests package
aherrmann Feb 7, 2023
269ebe9
Enable nix-file-test
aherrmann Feb 7, 2023
15a92d1
nix-file-deps-test
aherrmann Feb 7, 2023
6900e06
nixpkgs-git-repository-test
aherrmann Feb 7, 2023
d5e7414
nixpkgs-local-repository-test
aherrmann Feb 7, 2023
8c44273
relative-imports test
aherrmann Feb 7, 2023
70c8ae0
output-filegroup-test
aherrmann Feb 7, 2023
40375e8
output-filegroup-manual-test
aherrmann Feb 7, 2023
e03fc8a
nixpkgs_location_expansion_test (mangling workaround)
aherrmann Feb 7, 2023
d612fe4
location expansion unit tests
aherrmann Feb 7, 2023
fd79345
bzlmod compatible location expansion
aherrmann Feb 7, 2023
9b7108a
Document location expansion and bzlmod workaround
aherrmann Feb 3, 2023
5f55c93
Update bazel_skylib and declare unittest toolchain
aherrmann Feb 8, 2023
13d4bae
Simplify location expansion test
aherrmann Feb 8, 2023
6debeb4
Add extra-args-test
aherrmann Feb 8, 2023
a7b5b58
Copy untested output-derivation-is-a-file
aherrmann Feb 8, 2023
5e6820c
Test --enable_bzlmod and testing/core
aherrmann Feb 8, 2023
dfe5c1b
Remove redundant test cases in core
aherrmann Feb 8, 2023
1e7dcb6
Move core/nixpkgs.nix --> docs/nixpkgs.nix
aherrmann Feb 8, 2023
dd77e78
Remove Java flags from core
aherrmann Feb 8, 2023
04c2312
Add .bazelrc to core/testing
aherrmann Feb 8, 2023
9afd22d
forward BZLMOD_ENABLED in CI step
aherrmann Feb 8, 2023
6efcc77
Only run bazel build in core
aherrmann Feb 9, 2023
d6ef4ca
Configure Nix provided JDK for testing
aherrmann Feb 9, 2023
292aab5
remove outdated todo note
aherrmann Feb 9, 2023
bb96d1f
Configure Java runtime in testing/core
aherrmann Feb 9, 2023
8bb2d2f
Remove unused rules_sh dependency
aherrmann Feb 9, 2023
b35044c
Set descriptive CI job name
aherrmann Feb 9, 2023
edd2fcb
Remove unused bzlmod parameter
aherrmann Feb 10, 2023
f0c2eec
Update mergify configuration
aherrmann Feb 10, 2023
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
Prev Previous commit
Next Next commit
Enable nix-file-test
  • Loading branch information
aherrmann committed Feb 8, 2023
commit 269ebe93ef5681a6c76321616bd110f71a08c1fb
1 change: 1 addition & 0 deletions testing/core/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -12,3 +12,4 @@ use_repo(non_module_deps, "hello")
use_repo(non_module_deps, "expr-test")
use_repo(non_module_deps, "attribute-test")
use_repo(non_module_deps, "expr-attribute-test")
use_repo(non_module_deps, "nix-file-test")
2 changes: 1 addition & 1 deletion testing/core/tests/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ package(default_testonly = 1)
"expr-test",
"attribute-test",
"expr-attribute-test",
#"nix-file-test",
"nix-file-test",
#"nix-file-deps-test",
#"nixpkgs-git-repository-test",
#"nixpkgs-local-repository-test",
1 change: 1 addition & 0 deletions testing/core/tests/nixpkgs.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import <nixpkgs> { config = {}; overlays = []; }
7 changes: 7 additions & 0 deletions testing/core/tests/nixpkgs_repositories.bzl
Original file line number Diff line number Diff line change
@@ -39,3 +39,10 @@ def nixpkgs_repositories():
nix_file_content = "import <nixpkgs> { config = {}; overlays = []; }",
repository = "@nixpkgs",
)

nixpkgs_package(
name = "nix-file-test",
attribute_path = "hello",
nix_file = "//tests:nixpkgs.nix",
repository = "@nixpkgs",
)