Merge pull request #6578 from kzys/upgrade-protobuild

estesp · web-flow · commit 590ef88c7181 · 2022-03-01T08:49:41.000-05:00
Use containerd/protobuild instead of stevvooe/protobuild
diff --git a/Protobuild.toml b/Protobuild.toml
@@ -1,4 +1,4 @@
-version = "unstable"
+version = "1"
 generator = "gogoctrd"
 plugins = ["grpc", "fieldpath"]
 
diff --git a/api/Protobuild.toml b/api/Protobuild.toml
@@ -1,4 +1,4 @@
-version = "unstable"
+version = "1"
 generator = "gogoctrd"
 plugins = ["grpc", "fieldpath"]
 
diff --git a/api/next.pb.txt b/api/next.pb.txt
@@ -181,8 +181,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -622,8 +622,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "exitedAt"
     }
@@ -703,8 +703,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "exitedAt"
     }
@@ -915,8 +915,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "createdAt"
     }
@@ -927,8 +927,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "updatedAt"
     }
@@ -1191,8 +1191,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -1210,8 +1210,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "createdAt"
     }
@@ -1222,8 +1222,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "updatedAt"
     }
@@ -1264,8 +1264,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -1352,8 +1352,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -1366,8 +1366,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -1412,8 +1412,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "startedAt"
     }
@@ -1424,8 +1424,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "updatedAt"
     }
@@ -1456,8 +1456,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "expected"
     }
@@ -1537,8 +1537,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "expected"
     }
@@ -1602,8 +1602,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "startedAt"
     }
@@ -1614,8 +1614,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "updatedAt"
     }
@@ -1639,8 +1639,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -1760,8 +1760,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "digest"
     }
@@ -2020,8 +2020,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "timestamp"
     }
@@ -2120,8 +2120,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "createdAt"
     }
@@ -2132,8 +2132,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "updatedAt"
     }
@@ -2557,8 +2557,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "createdAt"
     }
@@ -3279,8 +3279,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "createdAt"
     }
@@ -3291,8 +3291,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "updatedAt"
     }
@@ -3567,8 +3567,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "timestamp"
     }
@@ -3673,8 +3673,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "exitedAt"
     }
@@ -3913,8 +3913,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "exitedAt"
     }
@@ -4183,8 +4183,8 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_STRING
       options {
-        65001: 0
         65003: "github.com/opencontainers/go-digest.Digest"
+        65001: 0
       }
       json_name: "parentCheckpoint"
     }
@@ -4308,8 +4308,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "exitedAt"
     }
@@ -4436,8 +4436,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65001: 0
         65010: 1
+        65001: 0
       }
       json_name: "timestamp"
     }
diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools
@@ -21,7 +21,7 @@
 set -eu -o pipefail
 
 # install `protobuild` and other commands
-go install github.com/stevvooe/protobuild@v0.1.0
+go install github.com/containerd/protobuild@7e5ee24bc1f70e9e289fef15e2631eb3491320bf
 go install github.com/cpuguy83/go-md2man/v2@v2.0.1
 go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "unstable"`
	`1`	`+version = "1"`
`2`	`2`	`generator = "gogoctrd"`
`3`	`3`	`plugins = ["grpc", "fieldpath"]`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,8 @@ file {`
`181`	`181`	`label: LABEL_OPTIONAL`
`182`	`182`	`type: TYPE_STRING`
`183`	`183`	`options {`
`184`		`- 65001: 0`
`185`	`184`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`185`	`+ 65001: 0`
`186`	`186`	`}`
`187`	`187`	`json_name: "digest"`
`188`	`188`	`}`
`@@ -622,8 +622,8 @@ file {`
`622`	`622`	`type: TYPE_MESSAGE`
`623`	`623`	`type_name: ".google.protobuf.Timestamp"`
`624`	`624`	`options {`
`625`		`- 65001: 0`
`626`	`625`	`65010: 1`
	`626`	`+ 65001: 0`
`627`	`627`	`}`
`628`	`628`	`json_name: "exitedAt"`
`629`	`629`	`}`
`@@ -703,8 +703,8 @@ file {`
`703`	`703`	`type: TYPE_MESSAGE`
`704`	`704`	`type_name: ".google.protobuf.Timestamp"`
`705`	`705`	`options {`
`706`		`- 65001: 0`
`707`	`706`	`65010: 1`
	`707`	`+ 65001: 0`
`708`	`708`	`}`
`709`	`709`	`json_name: "exitedAt"`
`710`	`710`	`}`
`@@ -915,8 +915,8 @@ file {`
`915`	`915`	`type: TYPE_MESSAGE`
`916`	`916`	`type_name: ".google.protobuf.Timestamp"`
`917`	`917`	`options {`
`918`		`- 65001: 0`
`919`	`918`	`65010: 1`
	`919`	`+ 65001: 0`
`920`	`920`	`}`
`921`	`921`	`json_name: "createdAt"`
`922`	`922`	`}`
`@@ -927,8 +927,8 @@ file {`
`927`	`927`	`type: TYPE_MESSAGE`
`928`	`928`	`type_name: ".google.protobuf.Timestamp"`
`929`	`929`	`options {`
`930`		`- 65001: 0`
`931`	`930`	`65010: 1`
	`931`	`+ 65001: 0`
`932`	`932`	`}`
`933`	`933`	`json_name: "updatedAt"`
`934`	`934`	`}`
`@@ -1191,8 +1191,8 @@ file {`
`1191`	`1191`	`label: LABEL_OPTIONAL`
`1192`	`1192`	`type: TYPE_STRING`
`1193`	`1193`	`options {`
`1194`		`- 65001: 0`
`1195`	`1194`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1195`	`+ 65001: 0`
`1196`	`1196`	`}`
`1197`	`1197`	`json_name: "digest"`
`1198`	`1198`	`}`
`@@ -1210,8 +1210,8 @@ file {`
`1210`	`1210`	`type: TYPE_MESSAGE`
`1211`	`1211`	`type_name: ".google.protobuf.Timestamp"`
`1212`	`1212`	`options {`
`1213`		`- 65001: 0`
`1214`	`1213`	`65010: 1`
	`1214`	`+ 65001: 0`
`1215`	`1215`	`}`
`1216`	`1216`	`json_name: "createdAt"`
`1217`	`1217`	`}`
`@@ -1222,8 +1222,8 @@ file {`
`1222`	`1222`	`type: TYPE_MESSAGE`
`1223`	`1223`	`type_name: ".google.protobuf.Timestamp"`
`1224`	`1224`	`options {`
`1225`		`- 65001: 0`
`1226`	`1225`	`65010: 1`
	`1226`	`+ 65001: 0`
`1227`	`1227`	`}`
`1228`	`1228`	`json_name: "updatedAt"`
`1229`	`1229`	`}`
`@@ -1264,8 +1264,8 @@ file {`
`1264`	`1264`	`label: LABEL_OPTIONAL`
`1265`	`1265`	`type: TYPE_STRING`
`1266`	`1266`	`options {`
`1267`		`- 65001: 0`
`1268`	`1267`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1268`	`+ 65001: 0`
`1269`	`1269`	`}`
`1270`	`1270`	`json_name: "digest"`
`1271`	`1271`	`}`
`@@ -1352,8 +1352,8 @@ file {`
`1352`	`1352`	`label: LABEL_OPTIONAL`
`1353`	`1353`	`type: TYPE_STRING`
`1354`	`1354`	`options {`
`1355`		`- 65001: 0`
`1356`	`1355`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1356`	`+ 65001: 0`
`1357`	`1357`	`}`
`1358`	`1358`	`json_name: "digest"`
`1359`	`1359`	`}`
`@@ -1366,8 +1366,8 @@ file {`
`1366`	`1366`	`label: LABEL_OPTIONAL`
`1367`	`1367`	`type: TYPE_STRING`
`1368`	`1368`	`options {`
`1369`		`- 65001: 0`
`1370`	`1369`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1370`	`+ 65001: 0`
`1371`	`1371`	`}`
`1372`	`1372`	`json_name: "digest"`
`1373`	`1373`	`}`
`@@ -1412,8 +1412,8 @@ file {`
`1412`	`1412`	`type: TYPE_MESSAGE`
`1413`	`1413`	`type_name: ".google.protobuf.Timestamp"`
`1414`	`1414`	`options {`
`1415`		`- 65001: 0`
`1416`	`1415`	`65010: 1`
	`1416`	`+ 65001: 0`
`1417`	`1417`	`}`
`1418`	`1418`	`json_name: "startedAt"`
`1419`	`1419`	`}`
`@@ -1424,8 +1424,8 @@ file {`
`1424`	`1424`	`type: TYPE_MESSAGE`
`1425`	`1425`	`type_name: ".google.protobuf.Timestamp"`
`1426`	`1426`	`options {`
`1427`		`- 65001: 0`
`1428`	`1427`	`65010: 1`
	`1428`	`+ 65001: 0`
`1429`	`1429`	`}`
`1430`	`1430`	`json_name: "updatedAt"`
`1431`	`1431`	`}`
`@@ -1456,8 +1456,8 @@ file {`
`1456`	`1456`	`label: LABEL_OPTIONAL`
`1457`	`1457`	`type: TYPE_STRING`
`1458`	`1458`	`options {`
`1459`		`- 65001: 0`
`1460`	`1459`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1460`	`+ 65001: 0`
`1461`	`1461`	`}`
`1462`	`1462`	`json_name: "expected"`
`1463`	`1463`	`}`
`@@ -1537,8 +1537,8 @@ file {`
`1537`	`1537`	`label: LABEL_OPTIONAL`
`1538`	`1538`	`type: TYPE_STRING`
`1539`	`1539`	`options {`
`1540`		`- 65001: 0`
`1541`	`1540`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1541`	`+ 65001: 0`
`1542`	`1542`	`}`
`1543`	`1543`	`json_name: "expected"`
`1544`	`1544`	`}`
`@@ -1602,8 +1602,8 @@ file {`
`1602`	`1602`	`type: TYPE_MESSAGE`
`1603`	`1603`	`type_name: ".google.protobuf.Timestamp"`
`1604`	`1604`	`options {`
`1605`		`- 65001: 0`
`1606`	`1605`	`65010: 1`
	`1606`	`+ 65001: 0`
`1607`	`1607`	`}`
`1608`	`1608`	`json_name: "startedAt"`
`1609`	`1609`	`}`
`@@ -1614,8 +1614,8 @@ file {`
`1614`	`1614`	`type: TYPE_MESSAGE`
`1615`	`1615`	`type_name: ".google.protobuf.Timestamp"`
`1616`	`1616`	`options {`
`1617`		`- 65001: 0`
`1618`	`1617`	`65010: 1`
	`1618`	`+ 65001: 0`
`1619`	`1619`	`}`
`1620`	`1620`	`json_name: "updatedAt"`
`1621`	`1621`	`}`
`@@ -1639,8 +1639,8 @@ file {`
`1639`	`1639`	`label: LABEL_OPTIONAL`
`1640`	`1640`	`type: TYPE_STRING`
`1641`	`1641`	`options {`
`1642`		`- 65001: 0`
`1643`	`1642`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1643`	`+ 65001: 0`
`1644`	`1644`	`}`
`1645`	`1645`	`json_name: "digest"`
`1646`	`1646`	`}`
`@@ -1760,8 +1760,8 @@ file {`
`1760`	`1760`	`label: LABEL_OPTIONAL`
`1761`	`1761`	`type: TYPE_STRING`
`1762`	`1762`	`options {`
`1763`		`- 65001: 0`
`1764`	`1763`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`1764`	`+ 65001: 0`
`1765`	`1765`	`}`
`1766`	`1766`	`json_name: "digest"`
`1767`	`1767`	`}`
`@@ -2020,8 +2020,8 @@ file {`
`2020`	`2020`	`type: TYPE_MESSAGE`
`2021`	`2021`	`type_name: ".google.protobuf.Timestamp"`
`2022`	`2022`	`options {`
`2023`		`- 65001: 0`
`2024`	`2023`	`65010: 1`
	`2024`	`+ 65001: 0`
`2025`	`2025`	`}`
`2026`	`2026`	`json_name: "timestamp"`
`2027`	`2027`	`}`
`@@ -2120,8 +2120,8 @@ file {`
`2120`	`2120`	`type: TYPE_MESSAGE`
`2121`	`2121`	`type_name: ".google.protobuf.Timestamp"`
`2122`	`2122`	`options {`
`2123`		`- 65001: 0`
`2124`	`2123`	`65010: 1`
	`2124`	`+ 65001: 0`
`2125`	`2125`	`}`
`2126`	`2126`	`json_name: "createdAt"`
`2127`	`2127`	`}`
`@@ -2132,8 +2132,8 @@ file {`
`2132`	`2132`	`type: TYPE_MESSAGE`
`2133`	`2133`	`type_name: ".google.protobuf.Timestamp"`
`2134`	`2134`	`options {`
`2135`		`- 65001: 0`
`2136`	`2135`	`65010: 1`
	`2136`	`+ 65001: 0`
`2137`	`2137`	`}`
`2138`	`2138`	`json_name: "updatedAt"`
`2139`	`2139`	`}`
`@@ -2557,8 +2557,8 @@ file {`
`2557`	`2557`	`type: TYPE_MESSAGE`
`2558`	`2558`	`type_name: ".google.protobuf.Timestamp"`
`2559`	`2559`	`options {`
`2560`		`- 65001: 0`
`2561`	`2560`	`65010: 1`
	`2561`	`+ 65001: 0`
`2562`	`2562`	`}`
`2563`	`2563`	`json_name: "createdAt"`
`2564`	`2564`	`}`
`@@ -3279,8 +3279,8 @@ file {`
`3279`	`3279`	`type: TYPE_MESSAGE`
`3280`	`3280`	`type_name: ".google.protobuf.Timestamp"`
`3281`	`3281`	`options {`
`3282`		`- 65001: 0`
`3283`	`3282`	`65010: 1`
	`3283`	`+ 65001: 0`
`3284`	`3284`	`}`
`3285`	`3285`	`json_name: "createdAt"`
`3286`	`3286`	`}`
`@@ -3291,8 +3291,8 @@ file {`
`3291`	`3291`	`type: TYPE_MESSAGE`
`3292`	`3292`	`type_name: ".google.protobuf.Timestamp"`
`3293`	`3293`	`options {`
`3294`		`- 65001: 0`
`3295`	`3294`	`65010: 1`
	`3295`	`+ 65001: 0`
`3296`	`3296`	`}`
`3297`	`3297`	`json_name: "updatedAt"`
`3298`	`3298`	`}`
`@@ -3567,8 +3567,8 @@ file {`
`3567`	`3567`	`type: TYPE_MESSAGE`
`3568`	`3568`	`type_name: ".google.protobuf.Timestamp"`
`3569`	`3569`	`options {`
`3570`		`- 65001: 0`
`3571`	`3570`	`65010: 1`
	`3571`	`+ 65001: 0`
`3572`	`3572`	`}`
`3573`	`3573`	`json_name: "timestamp"`
`3574`	`3574`	`}`
`@@ -3673,8 +3673,8 @@ file {`
`3673`	`3673`	`type: TYPE_MESSAGE`
`3674`	`3674`	`type_name: ".google.protobuf.Timestamp"`
`3675`	`3675`	`options {`
`3676`		`- 65001: 0`
`3677`	`3676`	`65010: 1`
	`3677`	`+ 65001: 0`
`3678`	`3678`	`}`
`3679`	`3679`	`json_name: "exitedAt"`
`3680`	`3680`	`}`
`@@ -3913,8 +3913,8 @@ file {`
`3913`	`3913`	`type: TYPE_MESSAGE`
`3914`	`3914`	`type_name: ".google.protobuf.Timestamp"`
`3915`	`3915`	`options {`
`3916`		`- 65001: 0`
`3917`	`3916`	`65010: 1`
	`3917`	`+ 65001: 0`
`3918`	`3918`	`}`
`3919`	`3919`	`json_name: "exitedAt"`
`3920`	`3920`	`}`
`@@ -4183,8 +4183,8 @@ file {`
`4183`	`4183`	`label: LABEL_OPTIONAL`
`4184`	`4184`	`type: TYPE_STRING`
`4185`	`4185`	`options {`
`4186`		`- 65001: 0`
`4187`	`4186`	`65003: "github.com/opencontainers/go-digest.Digest"`
	`4187`	`+ 65001: 0`
`4188`	`4188`	`}`
`4189`	`4189`	`json_name: "parentCheckpoint"`
`4190`	`4190`	`}`
`@@ -4308,8 +4308,8 @@ file {`
`4308`	`4308`	`type: TYPE_MESSAGE`
`4309`	`4309`	`type_name: ".google.protobuf.Timestamp"`
`4310`	`4310`	`options {`
`4311`		`- 65001: 0`
`4312`	`4311`	`65010: 1`
	`4312`	`+ 65001: 0`
`4313`	`4313`	`}`
`4314`	`4314`	`json_name: "exitedAt"`
`4315`	`4315`	`}`
`@@ -4436,8 +4436,8 @@ file {`
`4436`	`4436`	`type: TYPE_MESSAGE`
`4437`	`4437`	`type_name: ".google.protobuf.Timestamp"`
`4438`	`4438`	`options {`
`4439`		`- 65001: 0`
`4440`	`4439`	`65010: 1`
	`4440`	`+ 65001: 0`
`4441`	`4441`	`}`
`4442`	`4442`	`json_name: "timestamp"`
`4443`	`4443`	`}`