[1.1] Make CI green again #3472
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
(cherry picked from commit 009e627)
Signed-off-by: Kir Kolyshkin <[email protected]>
|
Apparently we also need to fix linter... |
kolyshkin
changed the title
kolyshkin
changed the title
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] <[email protected]> (cherry picked from commit a43485c) Signed-off-by: Kir Kolyshkin <[email protected]>
... which adds a wee more whitespace fixes. Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit 89733cd) Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
force-pushed
the
1.1-fix-fedora-ci-git
branch
from
10f084b to
3fa605f
Compare
(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 <[email protected]>
(cherry picked from commit 907aefd)
Signed-off-by: Kir Kolyshkin <[email protected]>
Also, remove "must be specified without patch version" as this is no longer true. Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit f7d4613) Signed-off-by: Kir Kolyshkin <[email protected]>
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 <[email protected]> (cherry picked from commit f7637de) Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
force-pushed
the
1.1-fix-fedora-ci-git
branch
from
3fa605f to
bf1cd88
Compare
AkihiroSuda
approved these changes
May 12, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of
to release-1.1 branch, fixing broken CI. See original PRs for description.