Update commit ID when the git ref changes.

Previously we were only regenerating the commit ID when the .git/HEAD file changed. When working on a branch the HEAD file doesn't change. It points to a ref like refs/heads/master that changes. So we can read back the contents of .git/HEAD using GN's read_file command and then mark the commit id as dirty when the ref changes. Should alleviate some of the shader cache problems. Bug: angleproject:4448 Change-Id: I1c39b12af3455e3620d80bec92a15f9921d9163b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2358519Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Ian Elliott <ianelliott@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Update commit ID when the git ref changes.
5f2ba637 · Jamie Madill · Commit Bot · 65ccbd71 · 5f2ba637
Commit 5f2ba637 authored Aug 15, 2020 by Jamie Madill Committed by Commit Bot Aug 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

BUILD.gn BUILD.gn +5 -0

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -477,6 +477,11 @@ action("commit_id") {
      exec_script("src/commit_id.py", [ "check" ], "value") == 1) {
    # commit id should depend on angle's HEAD revision
    inputs = [ ".git/HEAD" ]
+    branch = read_file(".git/HEAD", "string")
+    result = string_split(branch)
+    if (result[0] == "ref:") {
+      inputs += [ ".git/" + result[1] ]
+    }
  }

  args = [