* [PR PATCH] gnome-builder: fix tests
@ 2021-05-14 23:31 paper42
2021-05-14 23:46 ` [PR REVIEW] " ericonr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: paper42 @ 2021-05-14 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-builder-fix-tests
https://github.com/void-linux/void-packages/pull/30880
gnome-builder: fix tests
validating the appstream file with network can easily time out
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-builder-fix-tests-30880.patch --]
[-- Type: text/x-diff, Size: 2081 bytes --]
From 10fba412992f86a3822eae6c4245508d5c27f1dc Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 15 May 2021 01:24:23 +0200
Subject: [PATCH] gnome-builder: fix tests
validating the appstream file with network can easily time out
---
srcpkgs/gnome-builder/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 6480c2e11d61..6944f1eb429a 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
revision=1
build_style=meson
build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
+configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
@@ -13,11 +13,12 @@ makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
python3-gobject-devel sysprof-devel glade3-devel libportal-devel"
depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
+checkdepends="xvfb-run"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=b2844cfde821311939fb6ed3b18a49cd331413aea720393091583ab6a99e719a
patch_args="-Np1"
@@ -29,7 +30,6 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
-pre_configure() {
- # this test needs X
- vsed -i "s/test('test-text-iter'/#&/" src/tests/meson.build
+do_check() {
+ xvfb-run ninja -C build test
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR REVIEW] gnome-builder: fix tests
2021-05-14 23:31 [PR PATCH] gnome-builder: fix tests paper42
@ 2021-05-14 23:46 ` ericonr
2021-05-15 0:09 ` [PR PATCH] [Updated] " paper42
2021-05-15 0:25 ` [PR PATCH] [Merged]: " ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-05-14 23:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30880#discussion_r632861479
Comment:
The correct one for this release branch would be `gnome-builder-3-40`, but I guess you prefer to stick with the one that documents major releases?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] gnome-builder: fix tests
2021-05-14 23:31 [PR PATCH] gnome-builder: fix tests paper42
2021-05-14 23:46 ` [PR REVIEW] " ericonr
@ 2021-05-15 0:09 ` paper42
2021-05-15 0:25 ` [PR PATCH] [Merged]: " ericonr
2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2021-05-15 0:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-builder-fix-tests
https://github.com/void-linux/void-packages/pull/30880
gnome-builder: fix tests
validating the appstream file with network can easily time out
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-builder-fix-tests-30880.patch --]
[-- Type: text/x-diff, Size: 2093 bytes --]
From 84d6e0a8b6e12301f7a79922a261411422518a0a Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 15 May 2021 01:24:23 +0200
Subject: [PATCH] gnome-builder: fix tests
validating the appstream file with network can easily time out
---
srcpkgs/gnome-builder/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 6480c2e11d61..568d23be55db 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -4,7 +4,7 @@ version=3.40.2
revision=1
build_style=meson
build_helper=qemu
-configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
+configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
@@ -13,11 +13,12 @@ makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
python3-gobject-devel sysprof-devel glade3-devel libportal-devel"
depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
+checkdepends="xvfb-run"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-40/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=b2844cfde821311939fb6ed3b18a49cd331413aea720393091583ab6a99e719a
patch_args="-Np1"
@@ -29,7 +30,6 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
-pre_configure() {
- # this test needs X
- vsed -i "s/test('test-text-iter'/#&/" src/tests/meson.build
+do_check() {
+ xvfb-run ninja -C build test
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: gnome-builder: fix tests
2021-05-14 23:31 [PR PATCH] gnome-builder: fix tests paper42
2021-05-14 23:46 ` [PR REVIEW] " ericonr
2021-05-15 0:09 ` [PR PATCH] [Updated] " paper42
@ 2021-05-15 0:25 ` ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-05-15 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1501 bytes --]
There's a merged pull request on the void-packages repository
gnome-builder: fix tests
https://github.com/void-linux/void-packages/pull/30880
Description:
validating the appstream file with network can easily time out
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-05-15 0:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14 23:31 [PR PATCH] gnome-builder: fix tests paper42
2021-05-14 23:46 ` [PR REVIEW] " ericonr
2021-05-15 0:09 ` [PR PATCH] [Updated] " paper42
2021-05-15 0:25 ` [PR PATCH] [Merged]: " ericonr
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).