containers
/
conmon
mirror of https://github.com/containers/conmon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jindrich Novy 2025-08-28 18:25:58 +02:00 committed by Peter Hunt
parent 84edf228f5
commit 92e29d9b78
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.cirrus.yml
View File

@ -5,11 +5,10 @@ env:
#### ####
#### Global variables used for all tasks #### Global variables used for all tasks
#### ####
GOPATH: "/var/tmp/go"
CONMON_SLUG: "github.com/containers/conmon" CONMON_SLUG: "github.com/containers/conmon"
# Overrides default location (/tmp/cirrus) for repo clone (will become $SRC) # 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 # Required so $ENVLIB gets loaded and /bin/sh is not used
CIRRUS_SHELL: "/bin/bash" CIRRUS_SHELL: "/bin/bash"
# Save a little typing (path relative to $CIRRUS_WORKING_DIR) # Save a little typing (path relative to $CIRRUS_WORKING_DIR)
@ -63,7 +62,7 @@ fedora_packaging_task:
image: "${PRIOR_FEDORA_CONTAINER_FQIN}" image: "${PRIOR_FEDORA_CONTAINER_FQIN}"
script: script:
- dnf install -y rpm-build golang libseccomp-devel - dnf install -y rpm-build libseccomp-devel
- cd $CIRRUS_WORKING_DIR - cd $CIRRUS_WORKING_DIR
- make - make
- make -f .rpmbuild/Makefile - make -f .rpmbuild/Makefile
@ -75,8 +74,8 @@ fedora_packaging_task:
timeout_in: '20m' timeout_in: '20m'
# Verify calls to bin/config were saved # Verify build completes successfully
config_task: build_task:
# Runs within Cirrus's "community cluster" # Runs within Cirrus's "community cluster"
container: container:
image: "${FEDORA_CONTAINER_FQIN}" image: "${FEDORA_CONTAINER_FQIN}"
@ -84,10 +83,10 @@ config_task:
memory: 4 memory: 4
script: 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 - cd $CIRRUS_WORKING_DIR
- make config - make
- git diff --exit-code - make test
# Verify code was fmt'ed properly # Verify code was fmt'ed properly
@ -99,7 +98,7 @@ fmt_task:
memory: 4 memory: 4
script: script:
- dnf install -y clang clang-tools-extra golang - dnf install -y clang clang-tools-extra
- cd $CIRRUS_WORKING_DIR - cd $CIRRUS_WORKING_DIR
- make fmt - make fmt
- git diff --exit-code - git diff --exit-code

1
.github/workflows/integration.yml vendored
View File

@ -33,6 +33,7 @@ jobs:
- uses: actions/setup-go@v5 - uses: actions/setup-go@v5
with: with:
go-version: ${{ matrix.go-version }} go-version: ${{ matrix.go-version }}
cache: false
- name: Install BATS - name: Install BATS
run: | run: |
sudo apt-get update sudo apt-get update

2
rpm/conmon.spec
View File

@ -27,13 +27,13 @@ URL: https://github.com/containers/%{name}
# Tarball fetched from upstream # Tarball fetched from upstream
Source0: %{url}/archive/v%{version}.tar.gz Source0: %{url}/archive/v%{version}.tar.gz
%if %{with docs} %if %{with docs}
ExclusiveArch: %{golang_arches_future}
BuildRequires: go-md2man BuildRequires: go-md2man
%endif %endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: git-core BuildRequires: git-core
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
BuildRequires: pkgconfig
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: systemd-libs BuildRequires: systemd-libs
BuildRequires: make BuildRequires: make