From 92e29d9b78f7b9670a549a9530bc5313f8fa39b8 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Thu, 28 Aug 2025 18:25:58 +0200
Subject: [PATCH] Fix CI: Remove Go dependencies and fix missing make targets

- Remove GOPATH and golang package installations from all CI tasks
- Replace missing 'make config' target with build verification
- Add proper build dependencies (systemd-devel, libseccomp-devel)
- Update working directory path to remove Go-specific structure

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 .cirrus.yml                       | 17 ++++++++---------
 .github/workflows/integration.yml |  1 +
 rpm/conmon.spec                   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e85637d..27cea4f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,11 +5,10 @@ env:
     ####
     #### Global variables used for all tasks
     ####
-    GOPATH: "/var/tmp/go"
     CONMON_SLUG: "github.com/containers/conmon"
 
     # Overrides default location (/tmp/cirrus) for repo clone (will become $SRC)
-    CIRRUS_WORKING_DIR: "${GOPATH}/src/${CONMON_SLUG}"
+    CIRRUS_WORKING_DIR: "/var/tmp/src/${CONMON_SLUG}"
     # Required so $ENVLIB gets loaded and /bin/sh is not used
     CIRRUS_SHELL: "/bin/bash"
     # Save a little typing (path relative to $CIRRUS_WORKING_DIR)
@@ -63,7 +62,7 @@ fedora_packaging_task:
             image: "${PRIOR_FEDORA_CONTAINER_FQIN}"
 
     script:
-        - dnf install -y rpm-build golang libseccomp-devel
+        - dnf install -y rpm-build libseccomp-devel
         - cd $CIRRUS_WORKING_DIR
         - make
         - make -f .rpmbuild/Makefile
@@ -75,8 +74,8 @@ fedora_packaging_task:
     timeout_in: '20m'
 
 
-# Verify calls to bin/config were saved
-config_task:
+# Verify build completes successfully
+build_task:
     # Runs within Cirrus's "community cluster"
     container:
         image: "${FEDORA_CONTAINER_FQIN}"
@@ -84,10 +83,10 @@ config_task:
         memory: 4
 
     script:
-        - dnf install -y make glib2-devel git gcc golang
+        - dnf install -y make glib2-devel git gcc pkg-config systemd-devel libseccomp-devel
         - cd $CIRRUS_WORKING_DIR
-        - make config
-        - git diff --exit-code
+        - make
+        - make test
 
 
 # Verify code was fmt'ed properly
@@ -99,7 +98,7 @@ fmt_task:
         memory: 4
 
     script:
-        - dnf install -y clang clang-tools-extra golang
+        - dnf install -y clang clang-tools-extra
         - cd $CIRRUS_WORKING_DIR
         - make fmt
         - git diff --exit-code
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index c5f9ef6..19a3f38 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -33,6 +33,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
+          cache: false
       - name: Install BATS
         run: |
           sudo apt-get update
diff --git a/rpm/conmon.spec b/rpm/conmon.spec
index 7b7431c..78bf7a9 100644
--- a/rpm/conmon.spec
+++ b/rpm/conmon.spec
@@ -27,13 +27,13 @@ URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
 Source0: %{url}/archive/v%{version}.tar.gz
 %if %{with docs}
-ExclusiveArch: %{golang_arches_future}
 BuildRequires: go-md2man
 %endif
 BuildRequires: gcc
 BuildRequires: git-core
 BuildRequires: glib2-devel
 BuildRequires: libseccomp-devel
+BuildRequires: pkgconfig
 BuildRequires: systemd-devel
 BuildRequires: systemd-libs
 BuildRequires: make