fix: dubious ownership during dist

grafana · Feb 15, 2024 · 85a1bff · 85a1bff
1 parent c2110bb
commit 85a1bff
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/jsonnetfile.lock.json b/.github/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "workflows"
         }
       },
-      "version": "797d43b8a79e06427aaa688bfc77c4e74b5716fb",
-      "sum": "n3dBljY/P10BNd6agesEYxTtUKlcMf7dv0i6ekN6cmE="
+      "version": "6820acb44aefd029517da1b2d4edc6dc7938ef26",
+      "sum": "Sd26FiMXae0pLxHnq0AuICYy8O2Xrd1vgJjcnQQshTk="
     }
   ],
   "legacyImports": false

diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet
diff --git a/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet b/.github/vendor/github.com/grafana/loki-release/workflows/validate.libsonnet
diff --git a/.github/workflows/minor-release-pr.yml b/.github/workflows/minor-release-pr.yml
@@ -102,6 +102,7 @@ jobs:
           --volume .:/src/loki \
           --workdir /src/loki \
           --entrypoint /bin/sh "grafana/loki-build-image:0.33.0"
+          git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages
         EOF

diff --git a/.github/workflows/patch-release-pr.yml b/.github/workflows/patch-release-pr.yml
@@ -102,6 +102,7 @@ jobs:
           --volume .:/src/loki \
           --workdir /src/loki \
           --entrypoint /bin/sh "grafana/loki-build-image:0.33.0"
+          git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages
         EOF