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

Fix version caching test on Windows #17641

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Add diffutils to windows tools
run-full-compat: true
  • Loading branch information
dylant-da committed Oct 24, 2023
commit eec3632c0753a1029e34bdddc831c76069874c89
1 change: 1 addition & 0 deletions .dadew
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"bazel",
"cacert",
"curl",
"diffutils-3.6",
"gcloud",
"ojdkbuild11",
"maven-3.6.1",
Expand Down
4 changes: 2 additions & 2 deletions compatibility/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ last_non_canton_in_ledger_api_tests = "2.7.0-snapshot.20230427.11728.0.1f3c22cf"
args = [sdk_version],
data = [
"@daml-sdk-{}//:daml".format(sdk_version),
"@diffutils_nix//:bin/diff",
"@diffutils_dev_env//:bin/diff" if not is_windows else "@diffutils_dev_env//:bin/diff.exe",
],
deps = ["@bazel_tools//tools/bash/runfiles"],
)
for sdk_version in sdk_versions
if versions.is_at_least("2.7.5", sdk_version)
] if not is_windows else None
]

[
[
Expand Down
11 changes: 11 additions & 0 deletions compatibility/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ nixpkgs_package(
repositories = dev_env_nix_repos,
)

dev_env_tool(
name = "diffutils_dev_env",
nix_include = ["bin/diff"],
nix_label = "@diffutils_nix",
nix_paths = ["bin/diff"],
tools = ["diff"],
win_include = ["diff.exe"],
win_paths = ["diff.exe"],
win_tool = "diffutils-3.6",
)

haskell_register_ghc_bindists(
compiler_flags = [],
version = "9.0.2",
Expand Down
28 changes: 28 additions & 0 deletions dev-env/windows/manifests/diffutils-3.6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": "3.6",
"description": "A package of several programs related to finding differences between files",
"homepage": "https://www.gnu.org/software/diffutils/",
"license": "GPL-3.0-or-later",
"url": [
"https://steffen.gulpe.de/gnu-tools-for-windows/i686-w64-mingw32/cmp.exe",
"https://steffen.gulpe.de/gnu-tools-for-windows/i686-w64-mingw32/diff.exe",
"https://steffen.gulpe.de/gnu-tools-for-windows/i686-w64-mingw32/diff3.exe",
"https://steffen.gulpe.de/gnu-tools-for-windows/i686-w64-mingw32/sdiff.exe"
],
"hash": [
"d61bc5653d4f9a462413fdf2c19dfb464924e44db8547ec41257293f34e91513",
"39e70ccf42ba7235fa0d156f894b7fb757fcd4a9ce848f768a9fabe3d87b7196",
"d09fe558f9c9655eeee01d36221fad4ef8934b254d06812d45397c255dadfcdf",
"81648ccd7cca6f9af283dbf9da5e80965637ab2c095d0b323dc8895be01b68c1"
],
"bin": [
"cmp.exe",
"diff.exe",
"diff3.exe",
"sdiff.exe"
],
"checkver": {
"url": "https://steffen.gulpe.de/gnu-tools-for-windows",
"regex": "diffutils-([\\d.]+)-winbuild"
}
}
Loading