Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] fix PATH in CI
@ 2024-09-17 17:20 classabbyamp
  2024-09-17 17:25 ` [PR PATCH] [Updated] " classabbyamp
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: classabbyamp @ 2024-09-17 17:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages fix-path
https://github.com/void-linux/void-packages/pull/52251

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-path-52251.patch --]
[-- Type: text/x-diff, Size: 3518 bytes --]

From 9fbdd79dcb38424a65d288394f0534b39bc10fae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:19:13 -0400
Subject: [PATCH 1/2] .github/workflows/build: only add chroot-git to path
 during prep steps

fixes #52250
---
 .github/workflows/build.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..6894c677b184e6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,10 +42,10 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
       - name: Run lints
         run: |
@@ -64,7 +64,7 @@ jobs:
       image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
       options: --platform ${{ matrix.config.platform }}
       env:
-        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
         BOOTSTRAP: '${{ matrix.config.host }}'
         TEST: '${{ matrix.config.test }}'
@@ -97,10 +97,11 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          export PATH="/usr/libexec/chroot-git:$PATH"
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
 
       - name: Build and check packages

From 71f5bbe2f892772f0eb916d5a21f5a2957bbab9a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:20:21 -0400
Subject: [PATCH 2/2] temp

---
 srcpkgs/lazygit/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 0b44cb0b84ba25..69b0504ce0e1da 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,10 +1,11 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.43.1
-revision=2
+version=0.44.0
+revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
+make_check_args="-skip=TestIntegration"
 depends="git"
 short_desc="Simple terminal UI for git commands"
 maintainer="icp <pangolin@vivaldi.net>"
@@ -12,7 +13,7 @@ license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
-checksum=a9dad9e5bc9edb1111b3331d1ccb25f97f2593f51b1557a36c1765df08cb3006
+checksum=6cf617510127892f3ede2aea767ce725197902418ef7087c1cf0e91f06d00a16
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] fix PATH in CI
  2024-09-17 17:20 [PR PATCH] fix PATH in CI classabbyamp
@ 2024-09-17 17:25 ` classabbyamp
  2024-09-17 17:27 ` classabbyamp
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2024-09-17 17:25 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages fix-path
https://github.com/void-linux/void-packages/pull/52251

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-path-52251.patch --]
[-- Type: text/x-diff, Size: 4908 bytes --]

From 9fbdd79dcb38424a65d288394f0534b39bc10fae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:19:13 -0400
Subject: [PATCH 1/3] .github/workflows/build: only add chroot-git to path
 during prep steps

fixes #52250
---
 .github/workflows/build.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..6894c677b184e6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,10 +42,10 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
       - name: Run lints
         run: |
@@ -64,7 +64,7 @@ jobs:
       image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
       options: --platform ${{ matrix.config.platform }}
       env:
-        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
         BOOTSTRAP: '${{ matrix.config.host }}'
         TEST: '${{ matrix.config.test }}'
@@ -97,10 +97,11 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          export PATH="/usr/libexec/chroot-git:$PATH"
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
 
       - name: Build and check packages

From 71f5bbe2f892772f0eb916d5a21f5a2957bbab9a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:20:21 -0400
Subject: [PATCH 2/3] temp

---
 srcpkgs/lazygit/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 0b44cb0b84ba25..69b0504ce0e1da 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,10 +1,11 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.43.1
-revision=2
+version=0.44.0
+revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
+make_check_args="-skip=TestIntegration"
 depends="git"
 short_desc="Simple terminal UI for git commands"
 maintainer="icp <pangolin@vivaldi.net>"
@@ -12,7 +13,7 @@ license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
-checksum=a9dad9e5bc9edb1111b3331d1ccb25f97f2593f51b1557a36c1765df08cb3006
+checksum=6cf617510127892f3ede2aea767ce725197902418ef7087c1cf0e91f06d00a16
 
 post_install() {
 	vlicense LICENSE

From 018c34df4ccb01e2685ad9307e119b7e7aa37e8a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:24:56 -0400
Subject: [PATCH 3/3] fixup! .github/workflows/build: only add chroot-git to
 path during prep steps

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6894c677b184e6..936c54652f5ece 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -95,14 +95,18 @@ jobs:
 
       - name: Clone and checkout
         uses: classabbyamp/treeless-checkout-action@v1
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
       - name: Create hostrepo and prepare masterdir
         run: |
-          export PATH="/usr/libexec/chroot-git:$PATH"
           ln -s "$(pwd)" /hostrepo &&
           common/travis/set_mirror.sh &&
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
-      - run: common/travis/changed_templates.sh
+      - name: Find changed templates
+        run: common/travis/changed_templates.sh
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
 
       - name: Build and check packages
         run: |

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] fix PATH in CI
  2024-09-17 17:20 [PR PATCH] fix PATH in CI classabbyamp
  2024-09-17 17:25 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-09-17 17:27 ` classabbyamp
  2024-09-17 17:30 ` classabbyamp
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2024-09-17 17:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages fix-path
https://github.com/void-linux/void-packages/pull/52251

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-path-52251.patch --]
[-- Type: text/x-diff, Size: 5733 bytes --]

From 9fbdd79dcb38424a65d288394f0534b39bc10fae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:19:13 -0400
Subject: [PATCH 1/4] .github/workflows/build: only add chroot-git to path
 during prep steps

fixes #52250
---
 .github/workflows/build.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..6894c677b184e6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,10 +42,10 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
       - name: Run lints
         run: |
@@ -64,7 +64,7 @@ jobs:
       image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
       options: --platform ${{ matrix.config.platform }}
       env:
-        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
         BOOTSTRAP: '${{ matrix.config.host }}'
         TEST: '${{ matrix.config.test }}'
@@ -97,10 +97,11 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          export PATH="/usr/libexec/chroot-git:$PATH"
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
 
       - name: Build and check packages

From 71f5bbe2f892772f0eb916d5a21f5a2957bbab9a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:20:21 -0400
Subject: [PATCH 2/4] temp

---
 srcpkgs/lazygit/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 0b44cb0b84ba25..69b0504ce0e1da 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,10 +1,11 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.43.1
-revision=2
+version=0.44.0
+revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
+make_check_args="-skip=TestIntegration"
 depends="git"
 short_desc="Simple terminal UI for git commands"
 maintainer="icp <pangolin@vivaldi.net>"
@@ -12,7 +13,7 @@ license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
-checksum=a9dad9e5bc9edb1111b3331d1ccb25f97f2593f51b1557a36c1765df08cb3006
+checksum=6cf617510127892f3ede2aea767ce725197902418ef7087c1cf0e91f06d00a16
 
 post_install() {
 	vlicense LICENSE

From 018c34df4ccb01e2685ad9307e119b7e7aa37e8a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:24:56 -0400
Subject: [PATCH 3/4] fixup! .github/workflows/build: only add chroot-git to
 path during prep steps

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6894c677b184e6..936c54652f5ece 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -95,14 +95,18 @@ jobs:
 
       - name: Clone and checkout
         uses: classabbyamp/treeless-checkout-action@v1
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
       - name: Create hostrepo and prepare masterdir
         run: |
-          export PATH="/usr/libexec/chroot-git:$PATH"
           ln -s "$(pwd)" /hostrepo &&
           common/travis/set_mirror.sh &&
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
-      - run: common/travis/changed_templates.sh
+      - name: Find changed templates
+        run: common/travis/changed_templates.sh
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
 
       - name: Build and check packages
         run: |

From 73ac81ab29900fce2446e184757d0dce04471a08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:27:45 -0400
Subject: [PATCH 4/4] fixup! temp

---
 srcpkgs/lazygit/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 69b0504ce0e1da..e6e3102c9d56dc 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -14,6 +14,7 @@ homepage="https://github.com/jesseduffield/lazygit"
 changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
 checksum=6cf617510127892f3ede2aea767ce725197902418ef7087c1cf0e91f06d00a16
+make_check_pre="env PATH=/usr/libexec/chroot-git:${PATH}"
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] fix PATH in CI
  2024-09-17 17:20 [PR PATCH] fix PATH in CI classabbyamp
  2024-09-17 17:25 ` [PR PATCH] [Updated] " classabbyamp
  2024-09-17 17:27 ` classabbyamp
@ 2024-09-17 17:30 ` classabbyamp
  2024-09-17 17:34 ` classabbyamp
  2024-09-17 17:34 ` [PR PATCH] [Merged]: " classabbyamp
  4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2024-09-17 17:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages fix-path
https://github.com/void-linux/void-packages/pull/52251

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-path-52251.patch --]
[-- Type: text/x-diff, Size: 7491 bytes --]

From 9fbdd79dcb38424a65d288394f0534b39bc10fae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:19:13 -0400
Subject: [PATCH 1/5] .github/workflows/build: only add chroot-git to path
 during prep steps

fixes #52250
---
 .github/workflows/build.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..6894c677b184e6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,10 +42,10 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
       - name: Run lints
         run: |
@@ -64,7 +64,7 @@ jobs:
       image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
       options: --platform ${{ matrix.config.platform }}
       env:
-        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
         BOOTSTRAP: '${{ matrix.config.host }}'
         TEST: '${{ matrix.config.test }}'
@@ -97,10 +97,11 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          export PATH="/usr/libexec/chroot-git:$PATH"
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
 
       - name: Build and check packages

From 71f5bbe2f892772f0eb916d5a21f5a2957bbab9a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:20:21 -0400
Subject: [PATCH 2/5] temp

---
 srcpkgs/lazygit/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 0b44cb0b84ba25..69b0504ce0e1da 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,10 +1,11 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.43.1
-revision=2
+version=0.44.0
+revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
 go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
+make_check_args="-skip=TestIntegration"
 depends="git"
 short_desc="Simple terminal UI for git commands"
 maintainer="icp <pangolin@vivaldi.net>"
@@ -12,7 +13,7 @@ license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
-checksum=a9dad9e5bc9edb1111b3331d1ccb25f97f2593f51b1557a36c1765df08cb3006
+checksum=6cf617510127892f3ede2aea767ce725197902418ef7087c1cf0e91f06d00a16
 
 post_install() {
 	vlicense LICENSE

From 018c34df4ccb01e2685ad9307e119b7e7aa37e8a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:24:56 -0400
Subject: [PATCH 3/5] fixup! .github/workflows/build: only add chroot-git to
 path during prep steps

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6894c677b184e6..936c54652f5ece 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -95,14 +95,18 @@ jobs:
 
       - name: Clone and checkout
         uses: classabbyamp/treeless-checkout-action@v1
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
       - name: Create hostrepo and prepare masterdir
         run: |
-          export PATH="/usr/libexec/chroot-git:$PATH"
           ln -s "$(pwd)" /hostrepo &&
           common/travis/set_mirror.sh &&
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
-      - run: common/travis/changed_templates.sh
+      - name: Find changed templates
+        run: common/travis/changed_templates.sh
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
 
       - name: Build and check packages
         run: |

From 73ac81ab29900fce2446e184757d0dce04471a08 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:27:45 -0400
Subject: [PATCH 4/5] fixup! temp

---
 srcpkgs/lazygit/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 69b0504ce0e1da..e6e3102c9d56dc 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -14,6 +14,7 @@ homepage="https://github.com/jesseduffield/lazygit"
 changelog="https://github.com/jesseduffield/lazygit/releases"
 distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
 checksum=6cf617510127892f3ede2aea767ce725197902418ef7087c1cf0e91f06d00a16
+make_check_pre="env PATH=/usr/libexec/chroot-git:${PATH}"
 
 post_install() {
 	vlicense LICENSE

From 9f9cd1be102a6470a899d35e1a10c7e45ee0dd94 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:30:43 -0400
Subject: [PATCH 5/5] fixup! fixup! .github/workflows/build: only add
 chroot-git to path during prep steps

---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 936c54652f5ece..182941fec0aa8c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,9 +94,9 @@ jobs:
           xbps-install -yu
 
       - name: Clone and checkout
-        uses: classabbyamp/treeless-checkout-action@v1
         env:
           PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
           ln -s "$(pwd)" /hostrepo &&
@@ -104,9 +104,9 @@ jobs:
           common/travis/prepare.sh &&
           common/travis/fetch-xtools.sh
       - name: Find changed templates
-        run: common/travis/changed_templates.sh
         env:
           PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        run: common/travis/changed_templates.sh
 
       - name: Build and check packages
         run: |
@@ -134,6 +134,8 @@ jobs:
 
       - name: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         run: |
           if [ -s /tmp/templates ]; then
               xlocate -S &&

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] fix PATH in CI
  2024-09-17 17:20 [PR PATCH] fix PATH in CI classabbyamp
                   ` (2 preceding siblings ...)
  2024-09-17 17:30 ` classabbyamp
@ 2024-09-17 17:34 ` classabbyamp
  2024-09-17 17:34 ` [PR PATCH] [Merged]: " classabbyamp
  4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2024-09-17 17:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/classabbyamp/void-packages fix-path
https://github.com/void-linux/void-packages/pull/52251

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-path-52251.patch --]
[-- Type: text/x-diff, Size: 2964 bytes --]

From 5d590a35398dcbfc6d110369970f3baa20f9b53e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 17 Sep 2024 13:19:13 -0400
Subject: [PATCH] .github/workflows/build: only add chroot-git to path during
 prep steps

fixes #52250
---
 .github/workflows/build.yaml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a77d1d4890bfaf..182941fec0aa8c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,10 +42,10 @@ jobs:
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
       - run: common/travis/changed_templates.sh
       - name: Run lints
         run: |
@@ -64,7 +64,7 @@ jobs:
       image: ghcr.io/void-linux/void-buildroot-${{ matrix.config.libc }}:20240526R1
       options: --platform ${{ matrix.config.platform }}
       env:
-        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
         BOOTSTRAP: '${{ matrix.config.host }}'
         TEST: '${{ matrix.config.test }}'
@@ -94,14 +94,19 @@ jobs:
           xbps-install -yu
 
       - name: Clone and checkout
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         uses: classabbyamp/treeless-checkout-action@v1
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh &&
-         common/travis/fetch-xtools.sh
-      - run: common/travis/changed_templates.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh &&
+          common/travis/fetch-xtools.sh
+      - name: Find changed templates
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        run: common/travis/changed_templates.sh
 
       - name: Build and check packages
         run: |
@@ -129,6 +134,8 @@ jobs:
 
       - name: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
+        env:
+          PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         run: |
           if [ -s /tmp/templates ]; then
               xlocate -S &&

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Merged]: fix PATH in CI
  2024-09-17 17:20 [PR PATCH] fix PATH in CI classabbyamp
                   ` (3 preceding siblings ...)
  2024-09-17 17:34 ` classabbyamp
@ 2024-09-17 17:34 ` classabbyamp
  4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2024-09-17 17:34 UTC (permalink / raw)
  To: ml

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

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

fix PATH in CI
https://github.com/void-linux/void-packages/pull/52251

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-09-17 17:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-17 17:20 [PR PATCH] fix PATH in CI classabbyamp
2024-09-17 17:25 ` [PR PATCH] [Updated] " classabbyamp
2024-09-17 17:27 ` classabbyamp
2024-09-17 17:30 ` classabbyamp
2024-09-17 17:34 ` classabbyamp
2024-09-17 17:34 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).