Run Protobuild on GitHub Actions #1302

kzys · 2022-02-22T01:18:42Z

containerd is planning to migrate off from github.com/gogo/protobuf which will affect hcsshim. See containerd/containerd#6564 for the overall progress.

Before that, this commit runs Protobuild in GitHub Actions to make sure all generated files are reproducible from .proto files.

Signed-off-by: Kazuyoshi Kato [email protected]

ghost · 2022-02-22T01:32:21Z

All CLA requirements met.

.github/workflows/ci.yml

kzys · 2022-02-22T01:37:23Z

cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go

@@ -26,7 +27,7 @@ var _ = time.Kitchen
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package


Note that this is aligned with containerd.

https://github.com/containerd/containerd/blob/8b9498909dba6dda44fda26d95ef7dbcd1765995/api/events/container.pb.go#L28

kzys · 2022-02-22T17:14:18Z

~~This change will need containerd/protobuild#51.~~ I will use Linux in this PR for now.

kzys · 2022-02-22T18:23:47Z

The tests are all green in my fork. https://github.com/kzys/hcsshim/actions/runs/1883043415

kzys · 2022-02-23T00:52:29Z

.github/workflows/ci.yml

@@ -8,6 +8,50 @@ env:
  GOPROXY: off

 jobs:
+  proto:
+    # TODO: use Windows after merginig https://github.com/containerd/protobuild/pull/51.


@TBBle Should I use Windows for consistency?

I honestly don't know if it makes a difference. In fact, I hope it doesn't matter, as that would suggest something else is wrong, if we get different results from this based on platform.

When doing this by hand I did this on Windows myself, but the relevant procedure should be roughly the same, so maybe doing this validation on Linux is an extra level of prevention if a platform-specific difference does sneak in.

#51 got merged! Let me update this PR. I agree that generating Go files from proto files is platform-independent. Running Protobuild on different platforms is something Protobuild has to do. So hcsshim doesn't have to do that.

TBBle · 2022-02-27T06:27:17Z

.github/workflows/ci.yml

+          git clone --depth 1 https://github.com/containerd/containerd.git -b v1.6.0
+          cd containerd/cmd/protoc-gen-gogoctrd
+          go build
+          mkdir $GOPATH/bin
+          mv protoc-gen-gogoctrd $GOPATH/bin


Is the inability to use

go install github.com/containerd/containerd/cmd/[email protected]

a containerd bug?

I tried this out of curiosity, and it failed with

> go install github.com/containerd/containerd/cmd/[email protected] go install: github.com/containerd/containerd/cmd/[email protected] (in github.com/containerd/[email protected]): The go.mod file for the module providing named packages contains one or more replace directives. It must not contain directives that would cause it to be interpreted differently than if it were the main module.

but that might be me doing something wrong.

It is sadly "working as expected". golang/go#44840

The good news is that I will remove protoc-gen-gogoctrd soon from the build process, once we remove gogo/protobuf.

.github/workflows/ci.yml

dcantah · 2022-03-16T14:43:22Z

Needs a quick rebase

dcantah · 2022-04-05T16:45:12Z

@kzys Ping on the rebase (we added a new shim option here so the proto needs to be regenerated). Thanks!

containerd is planning to migrate off from github.com/gogo/protobuf which will affect hcsshim. See containerd/containerd#6564 for the overall progress. Before that, this commit runs Protobuild in GitHub Actions to make sure all generated files are reproducible from .proto files. Signed-off-by: Kazuyoshi Kato <[email protected]>

kzys · 2022-04-05T19:45:55Z

@dcantah Thanks. Rebased the PR.

katiewasnothere

lgtm

Related work items: #1302, #1325, #1331, #1338, #1340, #1346, #1348

containerd is planning to migrate off from github.com/gogo/protobuf which will affect hcsshim. See containerd/containerd#6564 for the overall progress. Before that, this commit runs Protobuild in GitHub Actions to make sure all generated files are reproducible from .proto files. Signed-off-by: Kazuyoshi Kato <[email protected]>

kzys force-pushed the gha-protobuild branch from f0de664 to 543c127 Compare February 22, 2022 01:32

kzys commented Feb 22, 2022

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

kzys commented Feb 22, 2022

View reviewed changes

kzys force-pushed the gha-protobuild branch 13 times, most recently from e60508f to c59138c Compare February 22, 2022 05:55

kzys force-pushed the gha-protobuild branch 3 times, most recently from 68fbf50 to 6dac14b Compare February 22, 2022 17:28

kzys marked this pull request as ready for review February 22, 2022 17:31

kzys requested a review from a team as a code owner February 22, 2022 17:31

kzys force-pushed the gha-protobuild branch from 6dac14b to 593f21e Compare February 22, 2022 17:33

TBBle mentioned this pull request Feb 22, 2022

Unlock google.golang.org/grpc #1177

Draft

2 tasks

kzys commented Feb 23, 2022

View reviewed changes

TBBle reviewed Feb 27, 2022

View reviewed changes

kzys force-pushed the gha-protobuild branch 2 times, most recently from c4a53a2 to b576476 Compare February 28, 2022 17:34

kzys force-pushed the gha-protobuild branch 13 times, most recently from 430008a to 603dd84 Compare February 28, 2022 19:18

anmaxvl approved these changes Feb 28, 2022

View reviewed changes

dcantah reviewed Mar 16, 2022

View reviewed changes

.github/workflows/ci.yml Outdated Show resolved Hide resolved

dcantah approved these changes Mar 16, 2022

View reviewed changes

kzys force-pushed the gha-protobuild branch 5 times, most recently from cf7c2cc to fa1205f Compare April 5, 2022 19:13

kzys force-pushed the gha-protobuild branch from fa1205f to 290c85e Compare April 5, 2022 19:21

katiewasnothere approved these changes Apr 5, 2022

View reviewed changes

dcantah merged commit 6b31cba into microsoft:master Apr 5, 2022

anmaxvl pushed a commit that referenced this pull request Feb 7, 2023

Merged PR 5946761: update ADO to 2028de8

e579da0

Related work items: #1302, #1325, #1331, #1338, #1340, #1346, #1348

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Run Protobuild on GitHub Actions #1302

Run Protobuild on GitHub Actions #1302

kzys commented Feb 22, 2022 •

edited

Loading

ghost commented Feb 22, 2022 •

edited by ghost

Loading

kzys Feb 22, 2022

kzys commented Feb 22, 2022 •

edited

Loading

kzys commented Feb 22, 2022

kzys Feb 23, 2022 •

edited

Loading

TBBle Feb 24, 2022

kzys Feb 24, 2022

TBBle Feb 27, 2022 •

edited

Loading

kzys Feb 28, 2022 •

edited

Loading

dcantah commented Mar 16, 2022

dcantah commented Apr 5, 2022 •

edited

Loading

kzys commented Apr 5, 2022

katiewasnothere left a comment

Run Protobuild on GitHub Actions #1302

Run Protobuild on GitHub Actions #1302

Conversation

kzys commented Feb 22, 2022 • edited Loading

ghost commented Feb 22, 2022 • edited by ghost Loading

kzys Feb 22, 2022

Choose a reason for hiding this comment

kzys commented Feb 22, 2022 • edited Loading

kzys commented Feb 22, 2022

kzys Feb 23, 2022 • edited Loading

Choose a reason for hiding this comment

TBBle Feb 24, 2022

Choose a reason for hiding this comment

kzys Feb 24, 2022

Choose a reason for hiding this comment

TBBle Feb 27, 2022 • edited Loading

Choose a reason for hiding this comment

kzys Feb 28, 2022 • edited Loading

Choose a reason for hiding this comment

dcantah commented Mar 16, 2022

dcantah commented Apr 5, 2022 • edited Loading

kzys commented Apr 5, 2022

katiewasnothere left a comment

Choose a reason for hiding this comment

kzys commented Feb 22, 2022 •

edited

Loading

ghost commented Feb 22, 2022 •

edited by ghost

Loading

kzys commented Feb 22, 2022 •

edited

Loading

kzys Feb 23, 2022 •

edited

Loading

TBBle Feb 27, 2022 •

edited

Loading

kzys Feb 28, 2022 •

edited

Loading

dcantah commented Apr 5, 2022 •

edited

Loading