[PR PATCH] common/travis/fetch_upstream.sh: fix CI for new git version

[PR PATCH] common/travis/fetch_upstream.sh: fix CI for new git version

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages common/fix-ci-git
https://github.com/void-linux/void-packages/pull/36725

common/travis/fetch_upstream.sh: fix CI for new git version
The newest git versions require [safe.directory](https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory)
to work properly for repos owned by others.

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36725.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-common/fix-ci-git-36725.patch --]
[-- Type: text/x-diff, Size: 840 bytes --]

From c7f983702c1ff12cb048a456b445bd11ba30e714 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:39:39 -0400
Subject: [PATCH] common/travis/fetch_upstream.sh: fix CI for new git version

---
 common/travis/fetch_upstream.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 45315563e0b1..5c0256fdbe17 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

Re: [PR PATCH] [Updated] common/travis/fetch_upstream.sh: fix CI for new git version

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages common/fix-ci-git
https://github.com/void-linux/void-packages/pull/36725

common/travis/fetch_upstream.sh: fix CI for new git version
The newest git versions require [safe.directory](https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory)
to work properly for repos owned by others.

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36725.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-common/fix-ci-git-36725.patch --]
[-- Type: text/x-diff, Size: 1500 bytes --]

From c7f983702c1ff12cb048a456b445bd11ba30e714 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:39:39 -0400
Subject: [PATCH 1/2] common/travis/fetch_upstream.sh: fix CI for new git
 version

---
 common/travis/fetch_upstream.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 45315563e0b1..5c0256fdbe17 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From de38e516004657a3c821a6a71c36309144d21c29 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:46:38 -0400
Subject: [PATCH 2/2] chezmoi: test for ci

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bacfc8c9b294..9f6f08de3263 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.15.1
-revision=1
+revision=3
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"

Re: [PR PATCH] [Updated] common/travis/fetch_upstream.sh: fix CI for new git version

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1553 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages common/fix-ci-git
https://github.com/void-linux/void-packages/pull/36725

common/travis/fetch_upstream.sh: fix CI for new git version
The newest git versions require [safe.directory](https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory) to work properly for repos owned by others.

#### Testing the changes
- I tested the changes in this PR: **YES**
  Tested by temporarily adding a commit that changed a package to this PR, and [it succeeded](https://github.com/void-linux/void-packages/actions/runs/2177619018).
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36725.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-common/fix-ci-git-36725.patch --]
[-- Type: text/x-diff, Size: 840 bytes --]

From c7f983702c1ff12cb048a456b445bd11ba30e714 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:39:39 -0400
Subject: [PATCH] common/travis/fetch_upstream.sh: fix CI for new git version

---
 common/travis/fetch_upstream.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 45315563e0b1..5c0256fdbe17 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

Re: [PR PATCH] [Merged]: common/travis/fetch_upstream.sh: fix CI for new git version

[the-maldridge]

[-- Attachment #1: Type: text/plain, Size: 1377 bytes --]

There's a merged pull request on the void-packages repository

common/travis/fetch_upstream.sh: fix CI for new git version
https://github.com/void-linux/void-packages/pull/36725

Description:
The newest git versions require [safe.directory](https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory) to work properly for repos owned by others.

#### Testing the changes
- I tested the changes in this PR: **YES**
  Tested by temporarily adding a commit that changed a package to this PR, and [it succeeded](https://github.com/void-linux/void-packages/actions/runs/2177619018).
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->