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.

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

[release/0.9] Update CI #1891

Merged
merged 4 commits into from
Sep 19, 2023
Merged

Conversation

helsaawy
Copy link
Contributor

@helsaawy helsaawy commented Sep 8, 2023

release/0.9's CI is missing a lot of changes that have been spread out over different PRs.
Rather than manually select the relevant commits and cherry-pick them, checkout .github/workflows/ci.yml from main and update that file.

This adds protobuf and go gen checks, linting (which fails spectacularly across the repo), and containerd integration tests.

Changes are broken out into several commits:

  1. update the CI file
  2. run protobuild to update protobuf files
  3. run go generate to update auto-generated files
  4. vendor in all changes

Prior to this, steps 2 and 3 had not been done in some time (or verified by CI on this branch)

@helsaawy helsaawy requested a review from a team as a code owner September 8, 2023 00:15
@helsaawy helsaawy marked this pull request as draft September 8, 2023 15:58
@helsaawy helsaawy changed the title [release/0.9] ci update [release/0.9] Update CI Sep 8, 2023
@helsaawy helsaawy force-pushed the release0.9-ci-update branch 2 times, most recently from 11f7505 to fe27619 Compare September 8, 2023 18:12
Incorporate several CI changes from multiple PRs:

 - microsoft#1632
 - microsoft#1752
 - microsoft#1755
 - microsoft#1799
 - microsoft#1820
 - microsoft#1836
 - microsoft#1853
 - microsoft#1854

It is easier to checkout the changes directly rather than cherry-pick
commits and undo any changes that affect code not backported to this
release.

Remove `/usr/local/include` from `Protobuild.toml`, since it does not
exist on Windows, and our CI build logic does not rely on it.

Update `.gitignore` and `.gitattributes` to match main.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
CRI integration tests `TestContainerSymlinkVolumes/*` are consistently
failing.

Skip until a fix is backported from containerd 1.7 to 1.6.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

[release/0.9] Skip failing symlink tests

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
Many files were last updated with `github.com/gogo/protobuf@v1.2`, hence
the `proto.GoGoProtoPackageIsVersion2` assertion in the `*.pb.go` files.

Regenerate them using new version (v1.6.2) of `protoc-gen-gogoctrd`.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
Run `go generate` on repo to bring all auto-generated files up to date.

Fix bug in `internal\winapi\winapi.go` where `user.go` is referenced but
does not exist.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
@helsaawy helsaawy merged commit e874771 into microsoft:release/0.9 Sep 19, 2023
14 checks passed
@helsaawy helsaawy deleted the release0.9-ci-update branch September 19, 2023 00:03
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.

3 participants