bazel: 7.0.2 -> 7.1.0
This commit is contained in:
parent
cb243a9deb
commit
1e01835f07
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -43,7 +43,7 @@
|
||||||
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
|
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
|
||||||
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
|
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
|
||||||
, enableNixHacks ? false
|
, enableNixHacks ? false
|
||||||
, version ? "7.0.2",
|
, version ? "7.1.0",
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -51,7 +51,7 @@ let
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||||
hash = "sha256-3qK5BXXUPvPkHEAvZMJIGETsvwtA+FSLdaIEpNUE4DU=";
|
hash = "sha256-HiDQyJ98nRtKOBqMWGtKQ1qWv8Qfu880osKUlOs4Z6E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use builtins.fetchurl to avoid IFD, in particular on hydra
|
# Use builtins.fetchurl to avoid IFD, in particular on hydra
|
||||||
|
|
|
@ -1,25 +1,29 @@
|
||||||
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
||||||
index 845c8b6aa3..6f07298bd0 100644
|
index 4d8c46f8d5..ed311226f0 100644
|
||||||
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
||||||
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
|
||||||
@@ -171,14 +171,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
@@ -178,18 +178,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (shouldUseCachedRepos(env, handler, repoRoot, rule)) {
|
||||||
|
- // Make sure marker file is up-to-date; correctly describes the current repository state
|
||||||
|
- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env);
|
||||||
|
- if (env.valuesMissing()) {
|
||||||
|
- return null;
|
||||||
|
- }
|
||||||
|
- if (markerHash != null) { // repo exist & up-to-date
|
||||||
|
- return RepositoryDirectoryValue.builder()
|
||||||
|
- .setPath(repoRoot)
|
||||||
|
- .setDigest(markerHash)
|
||||||
|
- .setExcludeFromVendoring(shouldExcludeRepoFromVendoring(handler, rule))
|
||||||
|
- .build();
|
||||||
|
- }
|
||||||
|
+ // Nix hack: Always consider cached dirs as up-to-date
|
||||||
|
+ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build();
|
||||||
|
}
|
||||||
|
|
||||||
DigestWriter digestWriter = new DigestWriter(directories, repositoryName, rule);
|
/* At this point: This is a force fetch, a local repository, OR The repository cache is old or
|
||||||
if (shouldUseCachedRepos(env, handler, repoRoot, rule)) {
|
@@ -610,11 +600,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
||||||
- // Make sure marker file is up-to-date; correctly describes the current repository state
|
|
||||||
- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env);
|
|
||||||
- if (env.valuesMissing()) {
|
|
||||||
- return null;
|
|
||||||
- }
|
|
||||||
- if (markerHash != null) {
|
|
||||||
- return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(markerHash).build();
|
|
||||||
- }
|
|
||||||
+ // Nix hack: Always consider cached dirs as up-to-date
|
|
||||||
+ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* At this point: This is a force fetch, a local repository, OR The repository cache is old or
|
|
||||||
@@ -512,11 +506,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
|
|
||||||
builder.append(escape(key)).append(" ").append(escape(value)).append("\n");
|
builder.append(escape(key)).append(" ").append(escape(value)).append("\n");
|
||||||
}
|
}
|
||||||
String content = builder.toString();
|
String content = builder.toString();
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user