[test] Update manifest; go generate

Update description in manifest used for `test/` binaries. Add `test/tools.go` (similar to `tools/tools.go`), to track `goversioninfo` command. Update `.github/workflows/ci.yml` to run `go generate` from within `test/`. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
microsoft · Sep 28, 2023 · 9a456c7 · 9a456c7
1 parent 4dc2c8b
commit 9a456c7
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -195,6 +195,27 @@ jobs:
  exit $LASTEXITCODE
  }
 
+ - name: Validate go generate in test
+ shell: powershell
+ working-directory: test
+ run: |
+ Write-Output "::group::go generate"
+ go generate -x .\...
+ Write-Output "::endgroup::"
+ if ($LASTEXITCODE -ne 0) {
+ Write-Output "::error title=Go Generate::Error running go generate."
+ exit $LASTEXITCODE
+ }
+
+ git add --all --intent-to-add .
+ Write-Output "::group::git diff"
+ git diff --stat --exit-code
+ Write-Output "::endgroup::"
+ if ($LASTEXITCODE -ne 0) {
+ Write-Output "::error ::Generated files are not up to date. Please run ``go generate .\...`` from within ``./test``."
+ exit $LASTEXITCODE
+ }
+
  test-linux:
  needs: [lint, protos, verify-vendor, go-gen]
  runs-on: ubuntu-latest

diff --git a/test/go.mod b/test/go.mod
@@ -11,6 +11,7 @@ require (
  github.com/containerd/ttrpc v1.2.2
  github.com/containerd/typeurl/v2 v2.1.1
  github.com/google/go-containerregistry v0.16.1
+ github.com/josephspurrier/goversioninfo v1.4.0
  github.com/kevpar/cri v1.11.1-0.20220302210600-4c5c347230b2
  github.com/opencontainers/go-digest v1.0.0
  github.com/opencontainers/image-spec v1.1.0-rc3
@@ -35,6 +36,7 @@ require (
  github.com/Microsoft/didx509go v0.0.2 // indirect
  github.com/OneOfOne/xxhash v1.2.8 // indirect
  github.com/agnivade/levenshtein v1.0.1 // indirect
+ github.com/akavel/rsrc v0.10.2 // indirect
  github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/container-orchestrated-devices/container-device-interface v0.5.4 // indirect
  github.com/containerd/console v1.0.3 // indirect

diff --git a/test/go.sum b/test/go.sum
@@ -662,6 +662,7 @@ github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm
 github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
+github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
 github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -1292,6 +1293,7 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/josephspurrier/goversioninfo v1.4.0 h1:Puhl12NSHUSALHSuzYwPYQkqa2E1+7SrtAPJorKK0C8=
 github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=

diff --git a/test/pkg/manifest/manifest.xml b/test/pkg/manifest/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <description>containerd-shim-runhcs-v1</description>
+ <description>hcsshim-test</description>
  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
  <application>
  <!-- Windows 10 and Windows 11 -->

diff --git a/test/pkg/manifest/resource_windows_386.syso b/test/pkg/manifest/resource_windows_386.syso
diff --git a/test/pkg/manifest/resource_windows_amd64.syso b/test/pkg/manifest/resource_windows_amd64.syso
diff --git a/test/pkg/manifest/resource_windows_arm.syso b/test/pkg/manifest/resource_windows_arm.syso
diff --git a/test/pkg/manifest/resource_windows_arm64.syso b/test/pkg/manifest/resource_windows_arm64.syso
diff --git a/test/tools.go b/test/tools.go
@@ -0,0 +1,8 @@
+//go:build tools
+
+package tools
+
+import (
+ // create syso files for manifesting
+ _ "github.com/josephspurrier/goversioninfo/cmd/goversioninfo"
+)