thr3ads.net - Libguestfs - [Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS [Mar 2023]

If this information is useful, please help other people find it:
Share via:

Eric Blake

2023-Mar-01 16:54 UTC

[Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS

I took the easy route of crippling what I couldn't get working, on the
grounds that partial coverage is better than none now that we have
Cirrus CI checking commits on additional platforms.

This series got me to a green checkmark:
https://gitlab.com/ebblake/nbdkit/-/pipelines/793156983

but depends on an as-yet uncommitted patch in libvirt-ci:
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/360

Eric Blake (5):
  ci: Expose more env vars needed by build.sh
  ci: Another attempt at MacOS
  rust: Skip CI builds on MacOS
  golang: Skip CI builds on MacOS and newer FreeBSD
  perl: Skip CI builds on newer FreeBSD

 .gitlab-ci.yml                |  3 +++
 ci/cirrus/build.yml           |  3 +++
 ci/cirrus/macos-12.vars       |  4 ++--
 ci/gitlab.yml                 |  7 +++++++
 ci/gitlab/build-templates.yml | 31 ++++++++++++++++++++++++++++++-
 ci/gitlab/builds.yml          | 11 ++++++++---
 ci/manifest.yml               | 20 +++++++++++++++-----
 7 files changed, 68 insertions(+), 11 deletions(-)

-- 
2.39.2

Eric Blake

2023-Mar-01 16:54 UTC

head link

[Libguestfs] [nbdkit PATCH 1/5] ci: Expose more env vars needed by build.sh

In order for build.sh to see variables on Cirrus CI, we have to make
sure they get passed through from the gitlab container.  This will
make it possible to skip language bindings that don't work on FreeBSD
or MacOS.
---
 .gitlab-ci.yml      | 3 +++
 ci/cirrus/build.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ece6ced1..0141b6b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,6 +87,9 @@ include: '/ci/gitlab.yml'
           -e "s|[@]PYTHON@|$PYTHON|g"
           -e "s|[@]PIP3@|$PIP3|g"
           -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
+          -e "s|[@]PERL@|$PERL|g"
+          -e "s|[@]GOLANG@|$GOLANG|g"
+          -e "s|[@]RUST@|$RUST|g"
       <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
     - cat ci/cirrus/$NAME.yml
     - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml
index dd0b800a..30a6f2d8 100644
--- a/ci/cirrus/build.yml
+++ b/ci/cirrus/build.yml
@@ -9,6 +9,9 @@ env:
   PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@"
   PYTHON: "@PYTHON@"
   MAKE: "@MAKE@"
+  PERL: "@PERL@"
+  GOLANG: "@GOLANG@"
+  RUST: "@RUST@"

 build_task:
   install_script:
-- 
2.39.2

Eric Blake

2023-Mar-01 16:54 UTC

head link

[Libguestfs] [nbdkit PATCH 2/5] ci: Another attempt at MacOS

Import some lcitool improvements to avoid packages that are not
available through homebrew on MacOS, as well as some other tweaks:

- Bare libtorrent does not exist; libtorrent-rasterbar is available
but fails to compile due to broken pkg-config --cflags
- tcl is spelled tcl-tk
- python3-boto3, sfdisk, and python3-libnbd are missing
- Bare perl is sufficient for building the perl bindings, without
  needing a non-existent perl5-devel.
- Homebrew warns that compiling against e2fsprogs intentionally
  requires a modification to PKG_CONFIG_PATH.

With this, it's time to revert the allow-failure portion of commit
6b4178d0.

Depends on https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/360
---
 ci/cirrus/macos-12.vars       |  4 ++--
 ci/gitlab.yml                 |  7 +++++++
 ci/gitlab/build-templates.yml | 31 ++++++++++++++++++++++++++++++-
 ci/gitlab/builds.yml          |  3 +--
 ci/manifest.yml               |  3 +--
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/ci/cirrus/macos-12.vars b/ci/cirrus/macos-12.vars
index db838166..8c06197b 100644
--- a/ci/cirrus/macos-12.vars
+++ b/ci/cirrus/macos-12.vars
@@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='autoconf automake bash bash-completion ccache cpanminus curl
e2fsprogs expect flake8 git gnutls golang gzip jq libssh libtool
libtorrent-rasterbar libvirt lua make ocaml perl perl5-devel pkg-config python3
python3-boto3 python3-libnbd qemu rust sfdisk socat tcl xorriso xz zlib
zstd'
-PYPI_PKGS=''
+PKGS='autoconf automake bash bash-completion ccache cpanminus curl
e2fsprogs expect flake8 git gnutls golang gzip jq libssh libtool libvirt lua
make ocaml perl pkg-config python3 qemu rust socat tcl-tk xorriso xz zlib
zstd'
+PYPI_PKGS='boto3'
 PYTHON='/opt/homebrew/bin/python3'
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 68ffe725..643b6bf8 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -14,6 +14,12 @@
 #    created/updated. Setting this variable to a non-empty
 #    value allows CI testing prior to opening a merge request.
 #
+#  - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE,
+#    but uses the CI environment (containers) from the upstream project
+#    rather than creating and updating a throwaway environment
+#    Should not be used if the pushed branch includes CI container
+#    changes.
+#
 #  - RUN_CONTAINER_BUILDS - CI pipelines in upstream only
 #    publish containers if CI file changes are detected.
 #    Setting this variable to a non-empty value will force
@@ -44,6 +50,7 @@

 variables:
   RUN_UPSTREAM_NAMESPACE: nbdkit
+  FF_SCRIPT_SECTIONS: 1


 workflow:
diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml
index 0de34b7d..1bdec227 100644
--- a/ci/gitlab/build-templates.yml
+++ b/ci/gitlab/build-templates.yml
@@ -37,6 +37,13 @@
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH ==
$CI_DEFAULT_BRANCH'
       when: on_success

+    # forks: pushes to a branch when a pipeline run in upstream env is
explicitly requested
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV
&& $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" &&
$RUN_PIPELINE_UPSTREAM_ENV'
+      when: on_success
+
     # upstream: other web/api/scheduled pipelines targeting the default branch
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME ==
$CI_DEFAULT_BRANCH && $JOB_OPTIONAL'
       when: manual
@@ -75,6 +82,11 @@
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH !=
$CI_DEFAULT_BRANCH'
       when: on_success

+    # forks: avoid build in local env when job requests run in upstream
containers
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" &&
$RUN_PIPELINE_UPSTREAM_ENV'
+      when: never
+
+    # forks: pushes to branches with pipeline requested
     - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE &&
$JOB_OPTIONAL'
       when: manual
       allow_failure: true
@@ -151,6 +163,13 @@
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH ==
$CI_DEFAULT_BRANCH'
       when: on_success

+    # forks: pushes to a branch when a pipeline run in upstream env is
explicitly requested
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV
&& $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" &&
$RUN_PIPELINE_UPSTREAM_ENV'
+      when: on_success
+
     # upstream: other web/api/scheduled pipelines targeting the default branch
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME ==
$CI_DEFAULT_BRANCH && $JOB_OPTIONAL'
       when: manual
@@ -189,6 +208,11 @@
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH !=
$CI_DEFAULT_BRANCH'
       when: on_success

+    # forks: avoid build in local env when job requests run in upstream
containers
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" &&
$RUN_PIPELINE_UPSTREAM_ENV'
+      when: never
+
+    # forks: pushes to branches with pipeline requested
     - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE &&
$JOB_OPTIONAL'
       when: manual
       allow_failure: true
@@ -272,12 +296,17 @@
     - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push"'
       when: on_success

-    # forks: pushes to branches with pipeline requested
+    # forks: pushes to branches with pipeline requested (including pipeline in
upstream environment)
     - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE &&
$JOB_OPTIONAL'
       when: manual
       allow_failure: true
     - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE'
       when: on_success
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV
&& $JOB_OPTIONAL'
+      when: manual
+      allow_failure: true
+    - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE &&
$CI_PIPELINE_SOURCE == "push" &&
$RUN_PIPELINE_UPSTREAM_ENV'
+      when: on_success

     # upstream+forks: Run pipelines on MR, web, api & scheduled
     - if: '$CI_PIPELINE_SOURCE =~ /(web|api|schedule|merge_request_event)/
&& $JOB_OPTIONAL'
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 1e1ae91d..745fba68 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -405,7 +405,6 @@ aarch64-macos-12:
     INSTALL_COMMAND: brew install
     NAME: macos-12
     PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
-    PERL: skip
-    PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+    PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig:/opt/homebrew/opt/e2fsprogs/lib/pkgconfig
     UPDATE_COMMAND: brew update
     UPGRADE_COMMAND: brew upgrade
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 961917bd..2aaf4490 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -98,7 +98,6 @@ targets:
         allow-failure: true
         variables:
           PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
-          PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-          PERL: skip
+          PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig:/opt/homebrew/opt/e2fsprogs/lib/pkgconfig

   ubuntu-2004: x86_64
-- 
2.39.2

Eric Blake

2023-Mar-01 16:54 UTC

head link

[Libguestfs] [nbdkit PATCH 3/5] rust: Skip CI builds on MacOS

rust is causing odd linker errors on MacOS 12:

   Compiling nbdkit v0.2.0
(/private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/plugins/rust)
error: linking with `cc` failed: exit status: 1
|
...
= note: Undefined symbols for architecture arm64:
            "_nbdkit_error", referenced from:
                nbdkit::ffi::set_error::h9a0be1bb8e8c07fd in
libnbdkit-5dffb1334787f6f3.rlib(nbdkit-5dffb1334787f6f3.nbdkit.5e276eb4-cgu.0.rcgu.o)
            "_nbdkit_set_error", referenced from:
                nbdkit::ffi::set_error::h9a0be1bb8e8c07fd in
libnbdkit-5dffb1334787f6f3.rlib(nbdkit-5dffb1334787f6f3.nbdkit.5e276eb4-cgu.0.rcgu.o)
ld: symbol(s) not found for architecture arm64

While it looks like it is nbdkit's fault, it's easier to disable the
test for now to get to a green CI than to figure out why our list of
public symbols is not working on that platform.
---
 ci/gitlab/builds.yml | 1 +
 ci/manifest.yml      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 745fba68..2db78e23 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -406,5 +406,6 @@ aarch64-macos-12:
     NAME: macos-12
     PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
     PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig:/opt/homebrew/opt/e2fsprogs/lib/pkgconfig
+    RUST: skip
     UPDATE_COMMAND: brew update
     UPGRADE_COMMAND: brew upgrade
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 2aaf4490..4ad070d7 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -99,5 +99,6 @@ targets:
         variables:
           PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
           PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig:/opt/homebrew/opt/e2fsprogs/lib/pkgconfig
+          RUST: skip

   ubuntu-2004: x86_64
-- 
2.39.2

Eric Blake

2023-Mar-01 16:54 UTC

head link

[Libguestfs] [nbdkit PATCH 4/5] golang: Skip CI builds on MacOS and newer FreeBSD

golang is causing odd linker errors on these platforms:

FreeBSD 13:
go build -o
/tmp/cirrus-ci-build/plugins/golang/examples/disk/nbdkit-godisk-plugin.so
-buildmode=c-shared
# main
/usr/local/go119/pkg/tool/freebsd_amd64/link: running cc failed: exit status 1
ld: error: /lib/libc.so.7: undefined reference to environ
[--no-allow-shlib-undefined]
ld: error: /lib/libc.so.7: undefined reference to __progname
[--no-allow-shlib-undefined]
cc: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[3]: *** [Makefile:1097: examples/disk/nbdkit-godisk-plugin.so] Error 2

MacOS 12:
go build -o
/private/var/folders/76/zy5ktkns50v6gt5g8r0sf6sc0000gn/T/cirrus-ci-build/plugins/golang/examples/disk/nbdkit-godisk-plugin.so
-buildmode=c-shared
# main
/opt/homebrew/Cellar/go/1.20.1/libexec/pkg/tool/darwin_arm64/link: running clang
failed: exit status 1
ld: unknown option: --unresolved-symbols=ignore-in-object-files
clang: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[3]: *** [Makefile:1097: examples/disk/nbdkit-godisk-plugin.so] Error 1

It's easier to just ignore golang on these platforms than to worry
about why the Go community is playing weird games with the linker.
---
 ci/gitlab/builds.yml |  5 ++++-
 ci/manifest.yml      | 14 +++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 2db78e23..1772f882 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -374,6 +374,7 @@ x86_64-freebsd-13:
     CIRRUS_VM_IMAGE_NAME: freebsd-13-1
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    GOLANG: skip
     INSTALL_COMMAND: pkg install -y
     NAME: freebsd-13
     UPDATE_COMMAND: pkg update
@@ -388,6 +389,7 @@ x86_64-freebsd-current:
     CIRRUS_VM_IMAGE_NAME: freebsd-13-0-snap
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    GOLANG: skip
     INSTALL_COMMAND: pkg install -y
     NAME: freebsd-current
     UPDATE_COMMAND: pkg update
@@ -397,11 +399,12 @@ x86_64-freebsd-current:
 aarch64-macos-12:
   extends: .cirrus_build_job
   needs: []
-  allow_failure: true
+  allow_failure: false
   variables:
     CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest
     CIRRUS_VM_IMAGE_SELECTOR: image
     CIRRUS_VM_INSTANCE_TYPE: macos_instance
+    GOLANG: skip
     INSTALL_COMMAND: brew install
     NAME: macos-12
     PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 4ad070d7..554641b6 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -82,9 +82,17 @@ targets:

   freebsd-12: x86_64

-  freebsd-13: x86_64
+  freebsd-13:
+    jobs:
+      - arch: x86_64
+        variables:
+          GOLANG: skip

-  freebsd-current: x86_64
+  freebsd-current:
+    jobs:
+      - arch: x86_64
+        variables:
+          GOLANG: skip

   opensuse-leap-153: x86_64

@@ -95,10 +103,10 @@ targets:
   macos-12:
     jobs:
       - arch: aarch64
-        allow-failure: true
         variables:
           PATH_EXTRA:
/usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
           PKG_CONFIG_PATH:
/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig:/opt/homebrew/opt/e2fsprogs/lib/pkgconfig
           RUST: skip
+          GOLANG: skip

   ubuntu-2004: x86_64
-- 
2.39.2

Eric Blake

2023-Mar-01 16:54 UTC

head link

[Libguestfs] [nbdkit PATCH 5/5] perl: Skip CI builds on newer FreeBSD

perl is causing odd compiler errors, such as on FreeBSD 13:

In file included from /usr/local/lib/perl5/5.32/mach/CORE/sbox32_hash.h:4:
/usr/local/lib/perl5/5.32/mach/CORE/zaphod32_hash.h:164:5: error: '('
and '{' tokens introducing statement expression appear in different
macro expansion contexts [-Werror,-Wcompound-token-split-by-macro]
    ZAPHOD32_SCRAMBLE32(state[2],0x9c5cc4e9);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/local/lib/perl5/5.32/mach/CORE/zaphod32_hash.h:80:38: note: expanded from
macro 'ZAPHOD32_SCRAMBLE32'
#define ZAPHOD32_SCRAMBLE32(v,prime) STMT_START {  \
                                     ^~~~~~~~~~

It's easier to just ignore perl on these platforms than to worry about
when community will fix the compilation issue.
---
 ci/gitlab/builds.yml | 2 ++
 ci/manifest.yml      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 1772f882..3739da6f 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -377,6 +377,7 @@ x86_64-freebsd-13:
     GOLANG: skip
     INSTALL_COMMAND: pkg install -y
     NAME: freebsd-13
+    PERL: skip
     UPDATE_COMMAND: pkg update
     UPGRADE_COMMAND: pkg upgrade -y

@@ -392,6 +393,7 @@ x86_64-freebsd-current:
     GOLANG: skip
     INSTALL_COMMAND: pkg install -y
     NAME: freebsd-current
+    PERL: skip
     UPDATE_COMMAND: pkg update
     UPGRADE_COMMAND: pkg upgrade -y

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 554641b6..fba4faa8 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -87,12 +87,14 @@ targets:
       - arch: x86_64
         variables:
           GOLANG: skip
+          PERL: skip

   freebsd-current:
     jobs:
       - arch: x86_64
         variables:
           GOLANG: skip
+          PERL: skip

   opensuse-leap-153: x86_64

-- 
2.39.2

Laszlo Ersek

2023-Mar-01 17:43 UTC

head link

[Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS

On 3/1/23 17:54, Eric Blake wrote:> I took the easy route of crippling what I couldn't get working, on the
> grounds that partial coverage is better than none now that we have
> Cirrus CI checking commits on additional platforms.
> 
> This series got me to a green checkmark:
> https://gitlab.com/ebblake/nbdkit/-/pipelines/793156983
> 
> but depends on an as-yet uncommitted patch in libvirt-ci:
> https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/360
> 
> Eric Blake (5):
>   ci: Expose more env vars needed by build.sh
>   ci: Another attempt at MacOS
>   rust: Skip CI builds on MacOS
>   golang: Skip CI builds on MacOS and newer FreeBSD
>   perl: Skip CI builds on newer FreeBSD
> 
>  .gitlab-ci.yml                |  3 +++
>  ci/cirrus/build.yml           |  3 +++
>  ci/cirrus/macos-12.vars       |  4 ++--
>  ci/gitlab.yml                 |  7 +++++++
>  ci/gitlab/build-templates.yml | 31 ++++++++++++++++++++++++++++++-
>  ci/gitlab/builds.yml          | 11 ++++++++---
>  ci/manifest.yml               | 20 +++++++++++++++-----
>  7 files changed, 68 insertions(+), 11 deletions(-)
> 
series
Acked-by: Laszlo Ersek <lersek at redhat.com>

One question (for my understanding) about the context of patch#1:

           -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"

what's this [@] notation? Why do we need to sink the at-sign into a
bracket expression?

Thanks
Laszlo

Richard W.M. Jones

2023-Mar-02 09:55 UTC

head link

[Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS

ACK series, thanks for fixing this.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
nbdkit - Flexible, fast NBD server with plugins
https://gitlab.com/nbdkit/nbdkit

Libguestfs - Mar 2023 - [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS

[Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS

[Libguestfs] [nbdkit PATCH 1/5] ci: Expose more env vars needed by build.sh

[Libguestfs] [nbdkit PATCH 2/5] ci: Another attempt at MacOS

[Libguestfs] [nbdkit PATCH 3/5] rust: Skip CI builds on MacOS

[Libguestfs] [nbdkit PATCH 4/5] golang: Skip CI builds on MacOS and newer FreeBSD

[Libguestfs] [nbdkit PATCH 5/5] perl: Skip CI builds on newer FreeBSD

[Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS

[Libguestfs] [nbdkit PATCH 0/5] ci: Get to green status on FreeBSD and MacOS