Port to EL 6 and 8 by ayanimea · Pull Request #2 · ayanimea/gnu-xnee

ayanimea · 2026-03-07T09:46:21Z

This pull request introduces two new GitHub Actions workflows for building and packaging on Enterprise Linux 6 and 8, and updates the INSTALL documentation to clarify and modernize installation instructions. The workflows automate the build, test, and RPM packaging processes for both EL6 and EL8, ensuring compatibility and simplifying CI/CD for these environments. The documentation update brings the installation instructions in line with current GNU standards and practices.

CI/CD workflow additions:

Added .github/workflows/el6.yml to automate build, test, and RPM packaging for both x86_64 and i686 architectures on Enterprise Linux 6 using CentOS 6 containers, including handling EOL repository setup and artifact upload.
Added .github/workflows/el8.yml to automate build, test, and RPM packaging for Enterprise Linux 8 using AlmaLinux 8 containers, including PowerTools enablement and artifact upload.

Documentation improvements:

Updated INSTALL to clarify installation steps, modernize instructions, and align with GNU conventions, including details on optional targets like installcheck, uninstall, and distcheck, and revised copyright and distribution terms.

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…e_record_replay declaration Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…rrors; add extern to cnee_options; add .gitignore Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

… Makefile.cvs invocation Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

….h, config.h.in) Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…nore for test binaries Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…ST, add transitive X11 static deps Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

… to .gitignore Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…mic linking Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

….info) Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…te RPM on AlmaLinux 8 Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…lect SRPM Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…ote shell vars Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…in on x86_64 Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

… Xvfb in CI Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…kflow Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

The test -S check was incorrectly using the lock file path (/tmp/.X${_d}-lock) for a socket test. X11 lock files are regular files; the Unix socket lives at /tmp/.X11-unix/X${_d}. Update the check to test the actual socket path so the condition is meaningful. Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

- build/SPECS/cnee-el6.spec: EL6-compatible spec - License: GPLv2+ (EL6 RPM doesn't accept SPDX expressions) - make %{?_smp_mflags} instead of %make_build (not on EL6) - make install DESTDIR= instead of %make_install (not on EL6) - %doc COPYING instead of %license (no %license macro on EL6) - .github/workflows/el6.yml: EL6 workflow - centos:6 container; vault repos configured (CentOS 6 EOL) - yum instead of dnf; no PowerTools enablement needed - No Xvfb (e2e test script skips Group 9 gracefully when absent) - git config safe.directory uses || true for git 1.7 compat Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

- Drop `container: centos:6` at job level; checkout runs on Ubuntu host (Node 20 needs glibc >=2.17; CentOS 6 ships 2.12 — this was the root cause of the checkout failure) - All CentOS 6 work moved to explicit `docker run centos:6` steps - Fix vault repo URLs: switch from HTTP to HTTPS (HTTP returns 403) - Use `printf '%s\\n'` for repo file to avoid YAML-breaking nested heredoc (YAML parser rejects `[base]` at column 0 inside a block scalar) - Add `strategy.matrix: {arch: [x86_64, i686]}` to build both arches - i686 leg: install libgcc.i686 + multilib headers, create i686-redhat-linux-gnu-gcc wrapper (exec gcc -m32), configure with --host=i686-redhat-linux-gnu, rpmbuild with _host/_target_cpu defines - Artifact names: cnee-el6-x86_64-rpm and cnee-el6-i686-rpm - gitignore: add *.rpm and doc/stamp-vti (generated files) - Remove accidentally-committed build artifacts (RPMs, stamp-vti) Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

…cation The 18-line printf block that writes the HTTPS vault repo config was duplicated nearly verbatim in the "Build and test" and "Build RPM" container steps. Add a "Write shared CentOS 6 vault repo helper" step that writes $RUNNER_TEMP/setup-el6-repos.sh once on the Ubuntu host. This file defines setup_centos6_vault_repos() with the full printf config block. Both container steps now source the helper via ". /setup-el6-repos.sh" (mounted read-only at /setup-el6-repos.sh) and call the function, so the vault URL configuration only lives in a single place. Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

ayanimea · 2026-03-08T14:12:31Z

@copilot open a new pull request to apply changes based on the comments in this thread

Copilot · 2026-03-08T14:12:38Z

@ayanimea I've opened a new pull request, #6, to work on those changes. Once the pull request is ready, I'll request review from you.

…files Makefile.cvs uses perl to patch the generated configure script. Add perl to all relevant yum/dnf install lists and RPM BuildRequires to ensure builds work in minimal buildroots without relying on perl being present implicitly. Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Add perl as explicit build dependency in EL6/EL8 workflows and spec files

Copilot

Pull request overview

Copilot reviewed 27 out of 28 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-08T14:33:03Z

+gdoc_MANS =
+gdoc_TEXINFOS =


This new makefile fragment appears unused: a repo-wide search finds no references to Makefile.gdoc, gdoc_MANS, or gdoc_TEXINFOS. If it’s not intended to be included from another Makefile.am, consider removing it to avoid dead build files, or wire it into the doc build so it has an effect.

Suggested change

gdoc_MANS =

gdoc_TEXINFOS =

# doc/Makefile.gdoc

# This file is intentionally left as a no-op.

# Any previous gdoc-specific make variables (gdoc_MANS, gdoc_TEXINFOS, etc.)

# have been removed because they were unused and not referenced by the build.

Copilot · 2026-03-08T14:33:03Z


 #define CNEE_DEMO_DELAYED_START 3
-xnee_option_t *cnee_options ;
+extern xnee_option_t *cnee_options ;


This file redeclares cnee_options locally. Since cnee/include/cnee.h already declares extern xnee_option_t *cnee_options;, prefer including that header here and dropping the local extern to avoid duplicate declarations drifting out of sync.

ayanimea · 2026-03-08T14:33:24Z

@copilot open a new pull request to apply changes based on the comments in this thread

Copilot · 2026-03-08T14:33:31Z

@ayanimea I've opened a new pull request, #7, to work on those changes. Once the pull request is ready, I'll request review from you.

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Fix duplicate extern declaration in cnee_demo.c and document Makefile.gdoc no-op intent

Copilot

Pull request overview

Copilot reviewed 27 out of 28 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-08T15:09:24Z

+assert_output_contains "cnee --version prints 'xnee'" "xnee" "$CNEE" --version
+assert_output_contains "cnee --version prints a version number" "[0-9]\.[0-9]" "$CNEE" --version
+
+assert_exit_zero "cnee -V (short) exits 0" "$CNEE" -V
+assert_output_contains "cnee -V prints same output as --version" "xnee" "$CNEE" -V


The --version output comes from xnee_version() and prints PACKAGE (currently Xnee) with a capital X. These assertions look for lowercase xnee, so they will fail on case-sensitive grep. Consider matching Xnee\|xnee (your helper already converts \| to |), using grep -Ei, or updating the expected substring to Xnee.

Suggested change

assert_output_contains "cnee --version prints 'xnee'" "xnee" "$CNEE" --version

assert_output_contains "cnee --version prints a version number" "[0-9]\.[0-9]" "$CNEE" --version

assert_exit_zero "cnee -V (short) exits 0" "$CNEE" -V

assert_output_contains "cnee -V prints same output as --version" "xnee" "$CNEE" -V

assert_output_contains "cnee --version prints 'xnee'" "Xnee\\|xnee" "$CNEE" --version

assert_output_contains "cnee --version prints a version number" "[0-9]\.[0-9]" "$CNEE" --version

assert_exit_zero "cnee -V (short) exits 0" "$CNEE" -V

assert_output_contains "cnee -V prints same output as --version" "Xnee\\|xnee" "$CNEE" -V

Copilot · 2026-03-08T15:09:25Z

 	./$(CNEE)$(EXEEXT) --texipage > cnee.texinfo
-	@echo "Generating info file from cnee.texi"
-	$(MAKEINFO) cnee.info
+	@echo "Generating info file from cnee.texinfo"
+	$(MAKEINFO) cnee.texinfo


make -C cnee/src man generates cnee.texinfo (and now runs makeinfo on it), but CLEAN_FILES only lists cnee.info cnee.texi. This leaves cnee.texinfo behind after make clean and makes the generated-texinfo filenames inconsistent (cnee.texi vs cnee.texinfo). Consider standardizing on one filename and adding the generated file(s) to CLEAN_FILES so they are cleaned reliably.

ayanimea · 2026-03-08T15:09:32Z

@copilot open a new pull request to apply changes based on the comments in this thread

Copilot · 2026-03-08T15:09:39Z

@ayanimea I've opened a new pull request, #8, to work on those changes. Once the pull request is ready, I'll request review from you.

…nconsistency Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Fix version assertion case sensitivity and Makefile.am texinfo filename inconsistency

Copilot

Pull request overview

Copilot reviewed 27 out of 28 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot AI and others added 30 commits March 4, 2026 21:17

Initial plan

4dbe837

feat: add EL8 CI/CD workflow and RPM spec for Enterprise Linux 8 support

839293e

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: add texinfo dep, correct RPM spec files section, add missing cne…

16b8bad

…e_record_replay declaration Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: remove dead enum variable instances causing -fno-common linker e…

e2e6878

…rrors; add extern to cnee_options; add .gitignore Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

feat: add e2e tests for cnee; clean up committed build artifacts; fix…

821ebec

… Makefile.cvs invocation Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

chore: remove all remaining tracked build artifacts from repository

9eeef53

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: restore accidentally deleted source files (Makefile.am, acconfig…

e88fb76

….h, config.h.in) Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

chore: remove remaining tracked binary build artifacts; extend .gitig…

2c048a4

…nore for test binaries Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: static X11 linking, git archive dist, clean autotools/* EXTRA_DI…

8c8cdd7

…ST, add transitive X11 static deps Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: remove accidentally committed xnee-3.20/ dist dir; add dist dirs…

96fb723

… to .gitignore Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: remove libX11-static/libXtst-static (not in EL8 repos); use dyna…

c71f070

…mic linking Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: correct makeinfo invocation in man target (cnee.texinfo not cnee…

6705b68

….info) Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

chore: plan - fix spec %files and workflow SRPM collection for comple…

cb8229a

…te RPM on AlmaLinux 8 Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: complete RPM generation on AlmaLinux 8 - fix spec %files and col…

645fb94

…lect SRPM Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

feat: add workflow_dispatch trigger to allow manual workflow runs

0f4cbc0

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: git safe.directory for container, untrack generated sh files, qu…

0876080

…ote shell vars Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: add %{?_isa} to Requires/BuildRequires to prevent i686 lib pull-…

0ac74c8

…in on x86_64 Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

test: add record/replay e2e tests using Xvfb virtual display; install…

f01b05c

… Xvfb in CI Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: kill Xvfb on exit in e2e trap; pin upload-artifact to SHA in wor…

277e906

…kflow Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: guard trap cleanup with || true to ensure it always completes

9a68ab4

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

chore: bump version to 4.0 — major migration release

c65ca5e

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

fix: remove generated man pages from vcs, fix typos in .in sources

8be52ae

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Update doc/version.texi

294cc69

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update build/SPECS/cnee-el8.spec

d54ae0a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update doc/stamp-vti

ec829a3

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

fix(ci): EL6 checkout failure + add i686 matrix builds for EL6 and EL8

b656d99

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Initial plan

b286e7b

Copilot AI mentioned this pull request Mar 8, 2026

Add perl as explicit build dependency in EL6/EL8 workflows and spec files #6

Merged

Copilot AI and others added 2 commits March 8, 2026 14:19

Merge pull request #6 from ayanimea/copilot/sub-pr-2

51b08bf

Add perl as explicit build dependency in EL6/EL8 workflows and spec files

ayanimea requested a review from Copilot March 8, 2026 14:25

Copilot started reviewing on behalf of ayanimea March 8, 2026 14:25 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

Initial plan

82c96f3

Copilot AI mentioned this pull request Mar 8, 2026

Fix duplicate extern declaration in cnee_demo.c and document Makefile.gdoc no-op intent #7

Merged

Copilot AI and others added 3 commits March 8, 2026 14:36

Fix cnee_demo.c extern redeclaration and add Makefile.gdoc no-op comment

08857ac

Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

Update doc/Makefile.gdoc

0c26b08

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Merge pull request #7 from ayanimea/copilot/sub-pr-2

d892f1e

Fix duplicate extern declaration in cnee_demo.c and document Makefile.gdoc no-op intent

ayanimea requested a review from Copilot March 8, 2026 15:00

Copilot started reviewing on behalf of ayanimea March 8, 2026 15:00 View session

Copilot AI reviewed Mar 8, 2026

View reviewed changes

Initial plan

985f924

Copilot AI mentioned this pull request Mar 8, 2026

Fix version assertion case sensitivity and Makefile.am texinfo filename inconsistency #8

Merged

Fix version assertion case sensitivity and Makefile.am cnee.texinfo i…

c872afa

…nconsistency Co-authored-by: ayanimea <13433370+ayanimea@users.noreply.github.com>

ayanimea requested a review from Copilot March 8, 2026 15:22

Copilot started reviewing on behalf of ayanimea March 8, 2026 15:22 View session

Merge pull request #8 from ayanimea/copilot/sub-pr-2

b47751d

Fix version assertion case sensitivity and Makefile.am texinfo filename inconsistency

Copilot AI reviewed Mar 8, 2026

View reviewed changes

ayanimea merged commit f423b4a into master Mar 8, 2026
6 checks passed

ayanimea deleted the feature-alma8 branch March 8, 2026 15:56

-gdoc_MANS =
-gdoc_TEXINFOS =
+# doc/Makefile.gdoc
+# This file is intentionally left as a no-op.
+# Any previous gdoc-specific make variables (gdoc_MANS, gdoc_TEXINFOS, etc.)
+# have been removed because they were unused and not referenced by the build.

Conversation

ayanimea commented Mar 7, 2026

Uh oh!

ayanimea commented Mar 8, 2026

Uh oh!

Copilot AI commented Mar 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

ayanimea commented Mar 8, 2026

Uh oh!

Copilot AI commented Mar 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 8, 2026

Choose a reason for hiding this comment

Uh oh!

ayanimea commented Mar 8, 2026

Uh oh!

Copilot AI commented Mar 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants