Skip to content

Commit

Permalink
Merge pull request #523 from navidys/golang_update
Browse files Browse the repository at this point in the history
update golang to v1.22.6 and runc
  • Loading branch information
navidys authored Sep 27, 2024
2 parents f68173f + e19b937 commit 5271dfe
Show file tree
Hide file tree
Showing 49 changed files with 1,726 additions and 1,176 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-go@v5

with:
go-version: ">=1.21"
go-version: ">=1.22"

- name: Build binary
run: |
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '>=1.21'
go-version: '>=1.22'
- uses: actions/checkout@v4
- run: |
go mod tidy
Expand All @@ -24,8 +24,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
# cannot use 1.21.X latest version since golangci-lint has an issue.
go-version: '1.21.4'
go-version: '1.22'
- uses: actions/checkout@v4
- run: |
bash hack/install_dep.sh
Expand Down Expand Up @@ -60,7 +59,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '>=1.21'
go-version: '>=1.22'
- uses: actions/checkout@v4
- run: |
make all
7 changes: 3 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '>=1.21'
go-version: '>=1.22'
- uses: actions/checkout@v4
- run: |
go mod tidy
Expand All @@ -60,8 +60,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
# cannot use 1.21.X latest version since golangci-lint has an issue.
go-version: '1.21.4'
go-version: '1.22'
- uses: actions/checkout@v4
- run: |
bash hack/install_dep.sh
Expand All @@ -87,7 +86,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '>=1.21'
go-version: '>=1.22'
- uses: actions/checkout@v4
- run: |
make all
Expand Down
13 changes: 7 additions & 6 deletions .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ jobs:
targets:
- fedora-latest-stable
- fedora-development
- epel-9-x86_64
- epel-9-aarch64
- centos-stream-9-x86_64
- centos-stream-9-aarch64
- centos-stream-10-x86_64
- centos-stream-10-aarch64
# Disabled until there is go 1.22.6 in centos stream
#- epel-9-x86_64
#- epel-9-aarch64
#- centos-stream-9-x86_64
#- centos-stream-9-aarch64
#- centos-stream-10-x86_64
#- centos-stream-10-aarch64
actions:
post-upstream-clone:
- "rpkg spec --outdir ./"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/containers/podman-tui

go 1.21.0
go 1.22.6

require (
github.com/BurntSushi/toml v1.4.0
Expand Down Expand Up @@ -154,4 +154,4 @@ require (
tags.cncf.io/container-device-interface v0.8.0 // indirect
)

replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.1-0.20220617142545-8b9452f75cbc
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.1-0.20240131200429-02120488a4c0
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
github.com/opencontainers/runc v1.1.1-0.20220617142545-8b9452f75cbc h1:qjkUzmFsOFbQyjObybk40mRida83j5IHRaKzLGdBbEU=
github.com/opencontainers/runc v1.1.1-0.20220617142545-8b9452f75cbc/go.mod h1:wUOQGsiKae6VzA/UvlCK3cO+pHk8F2VQHlIoITEfMM8=
github.com/opencontainers/runc v1.1.1-0.20240131200429-02120488a4c0 h1:NwSQ/5rex97Rum/xZOMjlDQbbZ8YJKOTihf9sxqHxtE=
github.com/opencontainers/runc v1.1.1-0.20240131200429-02120488a4c0/go.mod h1:tBsQqk9ETVlXxzXjk2Xh/1VjxC/U3Gaq5ps/rC/cadE=
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-tools v0.9.1-0.20230914150019-408c51e934dc h1:d2hUh5O6MRBvStV55MQ8we08t42zSTqBbscoQccWmMc=
Expand Down
4 changes: 2 additions & 2 deletions vendor/github.com/opencontainers/runc/NOTICE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 22 additions & 30 deletions vendor/github.com/opencontainers/runc/libcontainer/cgroups/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5271dfe

Please sign in to comment.