diff --git a/.cirrus.yml b/.cirrus.yml index 653a79ea..c3bf0765 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,8 +21,14 @@ env: SCRIPT_BASE: "./contrib/cirrus" # Google-cloud VM Images + # If you are updating IMAGE_SUFFIX: We are currently using rawhide for + # the containers_image_sequoia tests because the rust-podman-sequoia + # package is not available in earlier releases; once we update to a future + # Fedora release (or if the package is backported), switch back from Rawhide + # to the latest Fedora release. IMAGE_SUFFIX: "c20250910t092246z-f42f41d13" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" + RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}" # Container FQIN's FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" @@ -190,14 +196,21 @@ test_skopeo_task: # Required to be 200gig, do not modify - has i/o performance impact # according to gcloud CLI tool warning messages. disk: 200 - image_name: ${FEDORA_CACHE_IMAGE_NAME} + image_name: ${VM_IMAGE_NAME} matrix: - name: "Skopeo Test" # N/B: Name ref. by hack/get_fqin.sh env: BUILDTAGS: '' + VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} - name: "Skopeo Test w/ opengpg" env: BUILDTAGS: *withopengpg + VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} + - name: "Skopeo test w/ Sequoia (currently Rawhide)" + env: + BUILDTAGS: 'containers_image_sequoia' + # If you are removing the use of rawhide, also remove the VM_IMAGE_NAME condition from runner.sh . + VM_IMAGE_NAME: ${RAWHIDE_CACHE_IMAGE_NAME} setup_script: >- "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup vendor_script: >- @@ -226,6 +239,7 @@ meta_task: # Space-separated list of images used by this repository state IMGNAMES: | ${FEDORA_CACHE_IMAGE_NAME} + ${RAWHIDE_CACHE_IMAGE_NAME} build-push-${IMAGE_SUFFIX} BUILDID: "${CIRRUS_BUILD_ID}" REPOREF: "${CIRRUS_REPO_NAME}" diff --git a/Makefile b/Makefile index 4fd12949..3c6aaf57 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ GOBIN := $(shell $(GO) env GOBIN) GOOS ?= $(shell go env GOOS) GOARCH ?= $(shell go env GOARCH) +SEQUOIA_SONAME_DIR = + # N/B: This value is managed by Renovate, manual changes are # possible, as long as they don't disturb the formatting # (i.e. DO NOT ADD A 'v' prefix!) @@ -82,7 +84,7 @@ CONTAINER_GOSRC = /src/github.com/containers/skopeo CONTAINER_RUN ?= $(CONTAINER_CMD) --security-opt label=disable -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN) EXTRA_LDFLAGS ?= -SKOPEO_LDFLAGS := -ldflags '$(EXTRA_LDFLAGS)' +SKOPEO_LDFLAGS := -ldflags '-X go.podman.io/image/v5/signature/internal/sequoia.sequoiaLibraryDir=$(SEQUOIA_SONAME_DIR) $(EXTRA_LDFLAGS)' MANPAGES_MD = $(wildcard docs/*.md) MANPAGES ?= $(MANPAGES_MD:%.md=%) @@ -251,7 +253,7 @@ validate-docs: bin/skopeo hack/xref-helpmsgs-manpages test-unit-local: - $(GO) test -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$') + $(GO) test $(SKOPEO_LDFLAGS) -tags "$(BUILDTAGS)" $$($(GO) list -tags "$(BUILDTAGS)" -e ./... | grep -v '^github\.com/containers/skopeo/\(integration\|vendor/.*\)$$') vendor: $(GO) mod tidy diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index e5ac3df5..3ec9f49c 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -99,7 +99,7 @@ _run_vendor() { _run_build() { make bin/skopeo BUILDTAGS="$BUILDTAGS" - make install PREFIX=/usr/local + make install PREFIX=/usr/local BUILDTAGS="$BUILDTAGS" } _run_cross() {