Skip to content

Conversation

@kolyshkin
Copy link
Contributor

This is a partial backport of #4292 and a few other PRs.

High level overview:

  • bump some GHA CI deps
  • allow runc to be compiled with Go 1.22
  • add Go 1.22 to CI matrix
  • build release artefacts using Debian 12 and Go 1.22

dependabot bot and others added 9 commits June 7, 2024 11:18
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3 to 4.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v3...v4)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 27cbabd)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 7b65578)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Bumps [tim-actions/commit-message-checker-with-regex](https://github.com/tim-actions/commit-message-checker-with-regex) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/tim-actions/commit-message-checker-with-regex/releases)
- [Commits](tim-actions/commit-message-checker-with-regex@v0.3.1...v0.3.2)

---
updated-dependencies:
- dependency-name: tim-actions/commit-message-checker-with-regex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit fe6f33b)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Same as commit 2d0cd0b in main branch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit e66ba70)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This is a partial backport of commits 953e1cc and b32655d
from the main branch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 30dc98f)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since v5 removes caching [1], re-enable setup-go cache.

[1] golangci/golangci-lint-action#1024

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 6bcc736)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Note that github-actions output format is deprecated and no longer supported,
and it is also no longer needed since setup-go problem matcher already
handles default golangci-lint output format ("colored-line-number").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f452f66)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin changed the title [1.1] backport #4292 and some infra PRs [1.1] Support Go 1.22, bump some CI deps Jun 7, 2024
@kolyshkin kolyshkin added this to the 1.1.13 milestone Jun 7, 2024
@kolyshkin kolyshkin force-pushed the 1.1-backport-4292 branch from bd327fb to 62b8ab8 Compare June 7, 2024 18:29
kolyshkin added 3 commits June 7, 2024 11:32
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Currently, it is at v1.54.2.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 17e7e23)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit d63018c)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin force-pushed the 1.1-backport-4292 branch from 62b8ab8 to afab673 Compare June 7, 2024 18:33
lifubang and others added 4 commits June 7, 2024 11:37
Signed-off-by: lifubang <lifubang@acmcoder.com>
(cherry picked from commit 75e0219)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Go 1.23 includes a fix (https://go.dev/cl/587919) so go1.23.x can be
used. This fix is also backported to 1.22.4, so go1.22.x can also be
used (when x >= 4). Finally, for glibc >= 2.32 it doesn't really matter.

Add a note about Go 1.22.x > 1.22.4 to README as well.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit e660ef6)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Now when Go 1.22.4 is out it should no longer be a problem.

Leave Go 1.21 for CentOS testing (CentOS 7 and 8 have older glibc)
and Dockerfile (Debian 11 have older glibc).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit a3302f2)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit b74b33c)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin force-pushed the 1.1-backport-4292 branch from afab673 to 7219e0a Compare June 7, 2024 18:38
@kolyshkin kolyshkin added the backport/1.1-pr A backport PR to release-1.1 label Jun 7, 2024
@kolyshkin kolyshkin requested review from cyphar and lifubang June 9, 2024 21:15
Copy link
Member

@lifubang lifubang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I think we can prepare release 1.1.13 now.

@lifubang lifubang merged commit 8407d3c into opencontainers:release-1.1 Jun 9, 2024
@lifubang lifubang mentioned this pull request Jun 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.1-pr A backport PR to release-1.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants