Skip to content

Conversation

@kolyshkin
Copy link
Collaborator

@kolyshkin kolyshkin commented May 1, 2025

  1. Simplify github-actions by removing actions/cache.
  2. Remove vendored go-md2man.
  3. ci/gha: fix branch name (so GHA CI runs on main).
  4. ci/gha: add all-done job (to simplify adding "required" jobs in branch-protection rules).
  5. Remove "go mod vendor", add go.mod/go.sum validation to CI.
  6. Remove hack/kubernetes-e2e (unused).
  7. Remove hack/tree_status.sh.
  8. Makefile: simplify fmt.

Please review commit-by-commit, and see individual commit descriptions for more details.

Closes: #412

kolyshkin added 2 commits May 1, 2025 13:36
Because actions/setup-go does its own caching now, adding our own:
 - unnecessarily complicates things;
 - results in double caching.

Remove it.

Note that a single common cache will be used between the two jobs (which
is OK).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The version of go-md2man is quite old, and is not really need to be in
this repository. It is only used by `make docs` which does not make
sense to run in CI, as we don't check the resulting man page.

PS if needed, it is easy to install by this one-liner:

	go install github.com/cpuguy83/go-md2man/v2@latest

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin changed the title [WIP] Modernize CI Modernize CI (a bit) May 2, 2025
@kolyshkin kolyshkin marked this pull request as ready for review May 2, 2025 00:22
kolyshkin added 6 commits May 1, 2025 17:56
Apparently, since the master branch was renamed to main a few years
back, GHA CI jobs no longer run when a PR is merged.

Fix that. While at it, add some vertical whitespace.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The sole reason is to simplify branch protection rules,
requiring just these to be passed.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This repo never had ./vendor committed, so it's of little use,
especially with modern Go caching and proxying. So, let's remove
"go mod vendor" from the make's vendor target, and also remove
"make vendor" from the integration / conmon CI job.

Instead, add a separate GHA job to check for go.mod/go.sum correctness.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This is not used since commit 4e61870 ("gh actions: drop perma-failing
jobs").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The sole reason of having this was to produce a nice informative error
message in case of failure (and because the message was not explicitly
specified, it was entirely wrong in 1 of 2 use cases).

Let's drop it and just use git to fail the job if a tree is dirty.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
We can use git ls-files for clang-format, and gofmt directly for Go
(as we don't have vendor).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@jnovy
Copy link
Collaborator

jnovy commented May 5, 2025

LGTM, we depend on the external go-md2man anyway, there seems to be no longer a need to vendor it.

@jnovy jnovy merged commit e86e03f into containers:main May 5, 2025
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants