Merge pull request microsoft#1244 from dcantah/fix-ci

Revendor in /test and remove dead code
openshift · Dec 15, 2021 · 3c68303 · 3c68303
2 parents f8cbd0b + 0a92f8b
commit 3c68303
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ext4/tar2ext4/tar2ext4.go b/ext4/tar2ext4/tar2ext4.go
@@ -64,7 +64,6 @@ func MaximumDiskSize(size int64) Option {
 const (
  whiteoutPrefix = ".wh."
  opaqueWhiteout = ".wh..wh..opq"
- ext4BlockSize = compactext4.BlockSize
 )
 
 // ConvertTarToExt4 writes a compact ext4 file system image that contains the files in the

diff --git a/test/vendor/github.com/Microsoft/hcsshim/ext4/tar2ext4/tar2ext4.go b/test/vendor/github.com/Microsoft/hcsshim/ext4/tar2ext4/tar2ext4.go
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/winapi/process.go b/test/vendor/github.com/Microsoft/hcsshim/internal/winapi/process.go