Merge branch 'main' into yash/fix/1908-cp-tar-stream-support

Resolves the import collision in TestCLICopyCommand and adopts the warmup
image API the tests were moved to on main:

- keep both ContainerTestSupport and ContainerizationArchive imports; the
  former is where the fixture moved, the latter is used to build tar streams
  with ownership and modes the host cannot reproduce unprivileged
- WarmupImage.alpine320.rawValue replaces
  f.copyWarmupImage(ContainerFixture.warmupImages[0])

main also moved the containerization pin from 0.37.0 to 0.40.1.

Author: yash-mandaviya

.github/workflows/common.yml

@@ -32,7 +32,7 @@ jobs:
       DEVELOPER_DIR: "/Applications/Xcode_swift_6.3.app/Contents/Developer"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
 

.github/workflows/pr-label-apply.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Download PR metadata artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -39,7 +39,7 @@ jobs:
           echo "PR Number: ${PR_NUMBER}"
       
       - name: Apply labels using labeler
-        uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6
+        uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v6
         with:
           pr-number: ${{ steps.pr-number.outputs.number }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -44,7 +44,7 @@ jobs:
           test -e outputs/container-package/*.pkg || (echo "Missing .pkg file!" && exit 1)
 
       - name: Create release
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3
         with:
           token: ${{ github.token }}
           name: ${{ github.ref_name }}-prerelease

.gitignore

@@ -15,6 +15,7 @@ installer/
 .venv/
 .claude/
 .clitests/
+.vscode/
 test_results/
 *.pid
 *.log

Makefile

@@ -15,7 +15,7 @@
 # Version and build configuration variables
 BUILD_CONFIGURATION ?= debug
 WARNINGS_AS_ERRORS ?= true
-SWIFT_CONFIGURATION := $(if $(filter-out false,$(WARNINGS_AS_ERRORS)),-Xswiftc -warnings-as-errors)
+SWIFT_CONFIGURATION := $(if $(filter-out false,$(WARNINGS_AS_ERRORS)),-Xswiftc -warnings-as-errors) -Xswiftc -enable-testing
 # Code-coverage instrumentation, layered onto the shared build stages. Empty for
 # ordinary builds; the coverage-* targets opt in via a target-specific value so
 # only those goals compile instrumented binaries.
@@ -46,6 +46,15 @@ ifneq ($(strip $(LOG_ROOT)),)
 	SYSTEM_START_OPTS += --log-root "$(strip $(LOG_ROOT))"
 endif
 
+# swift test event-stream JSON output for the concurrent/global integration
+# passes, only when LOG_ROOT is set.
+CONCURRENT_EVENT_STREAM_OPTS :=
+GLOBAL_EVENT_STREAM_OPTS :=
+ifneq ($(strip $(LOG_ROOT)),)
+	CONCURRENT_EVENT_STREAM_OPTS += --event-stream-output-path "$(strip $(LOG_ROOT))/integration-concurrent.json" --event-stream-version 6.3
+	GLOBAL_EVENT_STREAM_OPTS += --event-stream-output-path "$(strip $(LOG_ROOT))/integration-global.json" --event-stream-version 6.3
+endif
+
 MACOS_VERSION := $(shell sw_vers -productVersion)
 MACOS_MAJOR := $(shell echo $(MACOS_VERSION) | cut -d. -f1)
 
@@ -279,15 +288,16 @@ define RUN_INTEGRATION
 	@echo Running the integration tests...
 	@$(INTEGRATION_PROFILE_ENV) bin/container --debug system start --timeout 60 --enable-kernel-install $(SYSTEM_START_OPTS) && \
 	{ \
+		if [ -n "$(APP_ROOT)" ]; then CONTAINER_APP_ROOT=$(APP_ROOT) && export CONTAINER_APP_ROOT ; fi ; \
 		CLITEST_LOG_ROOT=$(LOG_ROOT) && export CLITEST_LOG_ROOT ; \
 		CLITEST_SCRATCH_ROOT=$(SCRATCH_ROOT) && export CLITEST_SCRATCH_ROOT ; \
 		CONTAINER_CLI_PATH=$(ROOT_DIR)/bin/container && export CONTAINER_CLI_PATH ; \
 		echo "==> Warmup pass" && \
 		$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter "$(WARMUP_FILTER)" && \
 		echo "==> Concurrent pass (width=$(PARALLEL_WIDTH))" && \
-		$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --experimental-maximum-parallelization-width $(PARALLEL_WIDTH) --filter "$(CONCURRENT_FILTER)" && \
+		$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) $(CONCURRENT_EVENT_STREAM_OPTS) --experimental-maximum-parallelization-width $(PARALLEL_WIDTH) --filter "$(CONCURRENT_FILTER)" && \
 		echo "==> Global pass (serial)" && \
-		$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --experimental-maximum-parallelization-width 1 --filter "$(SERIAL_FILTER)" ; \
+		$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) $(GLOBAL_EVENT_STREAM_OPTS) --experimental-maximum-parallelization-width 1 --filter "$(SERIAL_FILTER)" ; \
 		exit_code=$$? ; \
 		$(INTEGRATION_POST_TEST) \
 		echo Ensuring apiserver stopped after the CLI integration tests ; \
@@ -298,6 +308,7 @@ endef
 
 .PHONY: integration
 integration: init-block
+	@echo "HOSTNAME: $$(hostname)"
 	$(RUN_INTEGRATION)
 
 .PHONY: coverage-integration
@@ -310,6 +321,7 @@ coverage-integration: INTEGRATION_POST_TEST = cp $(COV_DATA_DIR)/*.profraw $(COV
 # process/module profile in its own file so they don't collide.
 coverage-integration: INTEGRATION_PROFILE_ENV = LLVM_PROFILE_FILE=$(COVERAGE_OUTPUT_DIR)/integration/%p-%m%c.profraw
 coverage-integration: coverage-all
+	@echo "HOSTNAME: $$(hostname)"
 	@mkdir -p $(COVERAGE_OUTPUT_DIR)/integration
 	@rm -f $(COVERAGE_OUTPUT_DIR)/integration/*.profraw
 	$(RUN_INTEGRATION)