Skip to content

Conversation

@apostasie
Copy link
Contributor

@apostasie apostasie commented May 6, 2025

This adds a few minor tweaks to the CI:

  • commit 1 adds darwin as a target for some makefile tasks
  • commit 2 makes the Makefile more resilient in case git is missing
  • commit 3 is a minor simplification of the in-container CI job
  • commit 4 increases the timeout for Windows on TestRunRmTime (seen in [CI]: workaround gomodjail concurrency issue #4198 and others)

Though unrelated to one another, these are small and minor.
Still LMK if you prefer this PR to be broken down in individual chunks.

apostasie added 2 commits May 5, 2025 12:33
Signed-off-by: apostasie <[email protected]>
Signed-off-by: apostasie <[email protected]>
@apostasie apostasie marked this pull request as draft May 6, 2025 17:53

: "${WORKAROUND_ISSUE_622:=}"
if [[ "$WORKAROUND_ISSUE_622" = "1" ]]; then
if [[ "$WORKAROUND_ISSUE_622" != "" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

This breaks WORKAROUND_ISSUE_622=0 but I guess we do not need to keep compatibility for this workaround

BINARY ?= "nerdctl"
MAKEFILE_DIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
VERSION ?= $(shell git -C $(MAKEFILE_DIR) describe --match 'v[0-9]*' --dirty='.m' --always --tags)
VERSION ?= $(shell git -C $(MAKEFILE_DIR) describe --match 'v[0-9]*' --dirty='.m' --always --tags 2>/dev/null || echo no_git_information)
Copy link
Member

Choose a reason for hiding this comment

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

Bikeshedding: an empty string should suffice for no_git_information

Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 4af3a5d into containerd:main May 7, 2025
55 of 57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants