Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[1.1] Make CI green again #3472

Merged
merged 6 commits into from
May 12, 2022
Merged

[1.1] Make CI green again #3472

merged 6 commits into from
May 12, 2022

Commits on May 11, 2022

  1. Vagrantfile.fedora: fix build wrt new git 

    With the updated git in Fedora 35, we can't build it via sudo:

	ssh default 'sudo -i make -C /vagrant localunittest'
	make: Entering directory '/vagrant'
	fatal: unsafe repository ('/vagrant' is owned by someone else)
	To add an exception for this directory, call:

		git config --global --add safe.directory /vagrant
	go build -trimpath "-buildmode=pie"  -tags "seccomp" -ldflags "-X main.gitCommit= -X main.version=1.1.0+dev " -o runc .
	error obtaining VCS status: exit status 128
		Use -buildvcs=false to disable VCS stamping.
	make: Leaving directory '/vagrant'

This commit should fix this.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 009e627)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed May 11, 2022
    Configuration menu
    Copy the full SHA
    cd7fa00 View commit details
    Browse the repository at this point in the history

  2. build(deps): bump actions/checkout from 2 to 3 

    Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit a43485c)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @dependabot @kolyshkin
    dependabot[bot] authored and kolyshkin committed May 11, 2022
    Configuration menu
    Copy the full SHA
    eeac4e7 View commit details
    Browse the repository at this point in the history

  3. Format sources using gofumpt 0.2.1 

    ... which adds a wee more whitespace fixes.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 89733cd)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed May 11, 2022
    Configuration menu
    Copy the full SHA
    3b7f260 View commit details
    Browse the repository at this point in the history

  4. libct: StartInitialization: fix %w related warning 

    (on Go 1.18 this is actually an error)

> libcontainer/factory_linux.go:341:10: fmt.Errorf format %w has arg e of wrong type interface{}

Unfortunately, fixing it results in an errorlint warning:

> libcontainer/factory_linux.go#L344 non-wrapping format verb for fmt.Errorf. Use `%w` to format errors (errorlint)

so we have to silence that one.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 907aefd)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed May 11, 2022
    Configuration menu
    Copy the full SHA
    89f79ff View commit details
    Browse the repository at this point in the history

  5. ci: bump golangci-lint to v1.44 

    Also, remove "must be specified without patch version" as this is no
longer true.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f7d4613)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed May 11, 2022
    Configuration menu
    Copy the full SHA
    1feafc3 View commit details
    Browse the repository at this point in the history

  6. ci: use golangci-lint-action v3, GO_VERSION 

    golangci-lint-action v3 no longer installs golang itself, and the
version that comes with Ubuntu is not new/good enough.

Install go 1.17.x explicitly.

Introduce GO_VERSION environment variable to avoid duplication,
and use it instead of 1.x in other places, so that implicit go update
won't bring some unexpected failures.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f7637de)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
    @kolyshkin
    kolyshkin committed May 11, 2022
    Configuration menu
    Copy the full SHA
    bf1cd88 View commit details
    Browse the repository at this point in the history