Merge pull request #560 from kolyshkin/ci

Modernize CI (a bit)

Author: jnovy

.cirrus.yml

@@ -87,7 +87,7 @@ config_task:
         - dnf install -y make glib2-devel git gcc golang
         - cd $CIRRUS_WORKING_DIR
         - make config
-        - ./hack/tree_status.sh
+        - git diff --exit-code
 
 
 # Verify code was fmt'ed properly
@@ -102,7 +102,7 @@ fmt_task:
         - dnf install -y clang clang-tools-extra golang
         - cd $CIRRUS_WORKING_DIR
         - make fmt
-        - ./hack/tree_status.sh
+        - git diff --exit-code
 
 
 # Build the static binary

.github/workflows/integration.yml

@@ -4,44 +4,31 @@ on:
     tags:
       - v*
     branches:
-      - master
+      - main
   pull_request:
+
 jobs:
+
   conmon:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: '1.22'
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: go-integration-conmon-${{ hashFiles('**/go.mod') }}
-          restore-keys: go-integration-conmon-
       - run: sudo hack/github-actions-setup
       - name: Run conmon integration tests
         run: |
-          sudo make vendor
           sudo mkdir -p /var/run/crio
           sudo make test-binary
 
   cri-o:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: '1.22'
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: go-integration-cri-o-${{ hashFiles('**/go.mod') }}
-          restore-keys: go-integration-cri-o-
       - run: sudo hack/github-actions-setup
       - name: Run CRI-O integration tests
         run: |
@@ -52,3 +39,11 @@ jobs:
           sudo sh -c "cd $CRIO_DIR; ./test/test_runner.sh"
         env:
           JOBS: '2'
+
+  all-done:
+    needs:
+      - conmon
+      - cri-o
+    runs-on: ubuntu-24.04
+    steps:
+    - run: echo "All jobs completed"

.github/workflows/validate.yml

@@ -0,0 +1,35 @@
+name: validate
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - main
+      - release-*
+  pull_request:
+env:
+  GO_VERSION: 1.24
+permissions:
+  contents: read
+
+jobs:
+
+  deps:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: install go
+      uses: actions/setup-go@v5
+      with:
+        go-version: "${{ env.GO_VERSION }}"
+    - name: Verify Go dependencies
+      run: |
+        make vendor
+        git diff --exit-code
+
+  all-done:
+    needs:
+      - deps
+    runs-on: ubuntu-latest
+    steps:
+    - run: echo "All jobs completed"

Makefile

@@ -87,14 +87,10 @@ bin:
 
 .PHONY: vendor
 vendor:
-	GO111MODULE=on $(GO) mod tidy
-	GO111MODULE=on $(GO) mod vendor
-	GO111MODULE=on $(GO) mod verify
+	$(GO) mod tidy
+	$(GO) mod verify
 
 .PHONY: docs
-ifeq ($(GOMD2MAN),)
-docs: install.tools
-endif
 docs:
 	$(MAKE) -C docs
 
@@ -123,14 +119,10 @@ install.podman: bin/conmon
 	install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(LIBEXECDIR)/podman
 	install ${SELINUXOPT} -m 755 bin/conmon $(DESTDIR)$(LIBEXECDIR)/podman/conmon
 
-install.tools:
-	$(MAKE) -C tools
-
 .PHONY: fmt
 fmt:
-	find . '(' -name '*.h' -o -name '*.c' ! -path './vendor/*' ! -path './tools/vendor/*' ')' -exec clang-format -i {} \+
-	find . -name '*.go' ! -path './vendor/*' ! -path './tools/vendor/*' -exec gofmt -s -w {} \+
-	git diff --exit-code
+	git ls-files -z \*.c \*.h | xargs -0 clang-format -i
+	gofmt -s -w .
 
 
 .PHONY: dbuild

docs/Makefile

@@ -1,7 +1,7 @@
 PREFIX ?= /usr/local
 DATADIR := ${PREFIX}/share
 MANDIR := $(DATADIR)/man
-GOMD2MAN ?= ../tools/build/go-md2man
+GOMD2MAN ?= go-md2man
 
 docs: $(patsubst %.md,%,$(wildcard *.8.md))
 

hack/github-actions-setup

@@ -80,7 +80,7 @@ install_packages() {
 }
 
 install_conmon() {
-    sudo make install
+    sudo make install.bin
     conmon --version
 }