From f8b7f8e5d2b34754692b2d120febf7a19ec5bda0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 18 Sep 2024 15:16:07 -0500 Subject: [PATCH 1/2] Bump version of golanci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Pereira --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 851723645..d61e2372c 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,5 +22,5 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.58 + version: v1.61 args: -v From 44e21cb0ed0f7814babcc3d74e3bf9b20eea98c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 18 Sep 2024 15:35:13 -0500 Subject: [PATCH 2/2] Remove test checks that cannot be used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: João Pereira --- test/e2e/pull_test_unix_only_test.go | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/test/e2e/pull_test_unix_only_test.go b/test/e2e/pull_test_unix_only_test.go index 45c7c27c2..f2eb1fb15 100644 --- a/test/e2e/pull_test_unix_only_test.go +++ b/test/e2e/pull_test_unix_only_test.go @@ -9,7 +9,6 @@ import ( "fmt" "os" "path/filepath" - "runtime" "testing" "carvel.dev/imgpkg/test/helpers" @@ -26,10 +25,6 @@ func TestPull(t *testing.T) { defer env.Cleanup() t.Run("Image - copies the User Permission to group and other", func(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") - } - folder := env.Assets.CreateTempFolder("simple-image") env.Assets.AddFileToFolderWithPermissions(filepath.Join(folder, "all-on-user-only"), "some text", 0755) env.Assets.AddFileToFolderWithPermissions(filepath.Join(folder, "read-on-user-only"), "some text", 0455) @@ -70,10 +65,6 @@ func TestPull(t *testing.T) { }) t.Run("Image - when --preserve-permissions flag is provided it keeps the original permissions on the files", func(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") - } - folder := env.Assets.CreateTempFolder("simple-image") env.Assets.AddFileToFolderWithPermissions(filepath.Join(folder, "all-on-user-only"), "some text", 0755) env.Assets.AddFileToFolderWithPermissions(filepath.Join(folder, "read-on-user-only"), "some text", 0455) @@ -114,10 +105,6 @@ func TestPull(t *testing.T) { }) t.Run("Image - copies the User Permission to group and other but skips execution because umask is set to 0111", func(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") - } - folder := env.Assets.CreateTempFolder("simple-image") innerFolder := filepath.Join(folder, "some-folder") env.Assets.AddFolder(innerFolder, 0755) @@ -173,10 +160,6 @@ func TestPull(t *testing.T) { }) t.Run("Bundle - copies the User Permission to group and other", func(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://github.com/carvel-dev/imgpkg/issues/270") - } - bundleDir := env.BundleFactory.CreateBundleDir(helpers.BundleYAML, helpers.ImagesYAML) env.Assets.AddFileToFolderWithPermissions(filepath.Join(bundleDir, "all-on-user-only"), "some text", 0755) env.Assets.AddFileToFolderWithPermissions(filepath.Join(bundleDir, "read-on-user-only"), "some text", 0455) @@ -211,10 +194,6 @@ func TestPull(t *testing.T) { }) t.Run("Bundle - when --preserve-permissions flag is provided it keeps the original permissions on the files", func(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping test as this is a known issue: https://https://github.com/carvel-dev/imgpkg/issues/270") - } - bundleDir := env.BundleFactory.CreateBundleDir(helpers.BundleYAML, helpers.ImagesYAML) env.Assets.AddFileToFolderWithPermissions(filepath.Join(bundleDir, "all-on-user-only"), "some text", 0755) env.Assets.AddFileToFolderWithPermissions(filepath.Join(bundleDir, "read-on-user-only"), "some text", 0455)