Merge pull request containerd#4199 from apostasie/2025-05-c1

[CI]: small fixes

Author: AkihiroSuda

.github/workflows/job-test-in-container.yml

@@ -56,6 +56,11 @@ jobs:
       run:
         shell: bash
 
+    env:
+      # https://github.com/containerd/nerdctl/issues/622
+      # The only case when rootlesskit-version is force-specified is when we downgrade explicitly to v1
+      WORKAROUND_ISSUE_622: ${{ inputs.rootlesskit-version }}
+
     steps:
       - name: "Init: checkout"
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
@@ -137,16 +142,6 @@ jobs:
           sudo mkdir -p /etc/docker
           echo '{"ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64", "experimental": true, "ip6tables": true}' | sudo tee /etc/docker/daemon.json
           sudo systemctl restart docker
-      # Rootless with old rootlesskit wants to disable buildkit
-      - if: ${{ inputs.target != 'rootful' && inputs.rootlesskit-version != '' }}
-        name: "Init: disable buildkit for old rootlesskit"
-        run: |
-          # https://github.com/containerd/nerdctl/issues/622
-          WORKAROUND_ISSUE_622=
-          if echo "${ROOTLESSKIT_VERSION}" | grep -q v1; then
-            WORKAROUND_ISSUE_622=1
-          fi
-          echo "WORKAROUND_ISSUE_622=$WORKAROUND_ISSUE_622" >> "$GITHUB_ENV"
       - name: "Run: integration tests"
         run: |
           . ./hack/github/action-helpers.sh

Dockerfile.d/test-integration-rootless.sh

@@ -26,7 +26,7 @@ if [[ "$(id -u)" = "0" ]]; then
 	fi
 
 	: "${WORKAROUND_ISSUE_622:=}"
-	if [[ "$WORKAROUND_ISSUE_622" = "1" ]]; then
+	if [[ "$WORKAROUND_ISSUE_622" != "" ]]; then
 		touch /workaround-issue-622
 	fi
 

Makefile

@@ -39,9 +39,9 @@ DOCDIR  ?= $(DATADIR)/doc
 
 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)
 VERSION_TRIMMED := $(VERSION:v%=%)
-REVISION ?= $(shell git -C $(MAKEFILE_DIR) rev-parse HEAD)$(shell if ! git -C $(MAKEFILE_DIR) diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
+REVISION ?= $(shell git -C $(MAKEFILE_DIR) rev-parse HEAD 2>/dev/null || echo no_git_information)$(shell if ! git -C $(MAKEFILE_DIR) diff --no-ext-diff --quiet --exit-code 2>/dev/null; then echo .m; fi)
 LINT_COMMIT_RANGE ?= main..HEAD
 GO_BUILD_LDFLAGS ?= -s -w
 GO_BUILD_FLAGS ?=
@@ -136,7 +136,8 @@ lint-go-all:
 	@cd $(MAKEFILE_DIR) \
 		&& GOOS=linux make lint-go \
 		&& GOOS=windows make lint-go \
-		&& GOOS=freebsd make lint-go
+		&& GOOS=freebsd make lint-go \
+		&& GOOS=darwin make lint-go
 	$(call footer, $@)
 
 lint-yaml:
@@ -179,8 +180,9 @@ lint-licenses-all:
 	$(call title, $@)
 	@cd $(MAKEFILE_DIR) \
 		&& GOOS=linux make lint-licenses \
+		&& GOOS=windows make lint-licenses \
 		&& GOOS=freebsd make lint-licenses \
-		&& GOOS=windows make lint-licenses
+		&& GOOS=darwin make lint-go
 	$(call footer, $@)
 
 ##########################
@@ -196,8 +198,9 @@ fix-go-all:
 	$(call title, $@)
 	@cd $(MAKEFILE_DIR) \
 		&& GOOS=linux make fix-go \
+		&& GOOS=windows make fix-go \
 		&& GOOS=freebsd make fix-go \
-		&& GOOS=windows make fix-go
+		&& GOOS=darwin make lint-go
 	$(call footer, $@)
 
 fix-mod:

cmd/nerdctl/container/container_run_test.go

@@ -600,7 +600,11 @@ func TestRunRmTime(t *testing.T) {
 	base.Cmd("run", "--rm", testutil.CommonImage, "true").AssertOK()
 	t1 := time.Now()
 	took := t1.Sub(t0)
-	const deadline = 3 * time.Second
+	var deadline = 3 * time.Second
+	// FIXME: Investigate? it appears that since the move to containerd 2 on Windows, this is taking longer.
+	if runtime.GOOS == "windows" {
+		deadline = 10 * time.Second
+	}
 	if took > deadline {
 		t.Fatalf("expected to have completed in %v, took %v", deadline, took)
 	}