Skip to content

Commit

Permalink
Merge pull request #703 from joaopapereira/bump-go
Browse files Browse the repository at this point in the history
Bump go
  • Loading branch information
joaopapereira committed Sep 23, 2024
2 parents 484f01f + 44e21cb commit 6673822
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.58
version: v1.61
args: -v
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module carvel.dev/imgpkg

go 1.22.6
go 1.23.1

require (
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04
Expand Down
21 changes: 0 additions & 21 deletions test/e2e/pull_test_unix_only_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"fmt"
"os"
"path/filepath"
"runtime"
"testing"

"carvel.dev/imgpkg/test/helpers"
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 6673822

Please sign in to comment.