mirror of
https://github.com/containers/skopeo.git
synced 2025-09-17 15:30:38 +00:00
Also build+test with Sequoia
Relies on https://github.com/containers/automation_images/pull/411 . Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
16
.cirrus.yml
16
.cirrus.yml
@@ -21,8 +21,14 @@ env:
|
|||||||
SCRIPT_BASE: "./contrib/cirrus"
|
SCRIPT_BASE: "./contrib/cirrus"
|
||||||
|
|
||||||
# Google-cloud VM Images
|
# 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"
|
IMAGE_SUFFIX: "c20250910t092246z-f42f41d13"
|
||||||
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
|
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
|
||||||
|
RAWHIDE_CACHE_IMAGE_NAME: "rawhide-${IMAGE_SUFFIX}"
|
||||||
|
|
||||||
# Container FQIN's
|
# Container FQIN's
|
||||||
FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}"
|
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
|
# Required to be 200gig, do not modify - has i/o performance impact
|
||||||
# according to gcloud CLI tool warning messages.
|
# according to gcloud CLI tool warning messages.
|
||||||
disk: 200
|
disk: 200
|
||||||
image_name: ${FEDORA_CACHE_IMAGE_NAME}
|
image_name: ${VM_IMAGE_NAME}
|
||||||
matrix:
|
matrix:
|
||||||
- name: "Skopeo Test" # N/B: Name ref. by hack/get_fqin.sh
|
- name: "Skopeo Test" # N/B: Name ref. by hack/get_fqin.sh
|
||||||
env:
|
env:
|
||||||
BUILDTAGS: ''
|
BUILDTAGS: ''
|
||||||
|
VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME}
|
||||||
- name: "Skopeo Test w/ opengpg"
|
- name: "Skopeo Test w/ opengpg"
|
||||||
env:
|
env:
|
||||||
BUILDTAGS: *withopengpg
|
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: >-
|
setup_script: >-
|
||||||
"${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
|
"${GOSRC}/${SCRIPT_BASE}/runner.sh" setup
|
||||||
vendor_script: >-
|
vendor_script: >-
|
||||||
@@ -226,6 +239,7 @@ meta_task:
|
|||||||
# Space-separated list of images used by this repository state
|
# Space-separated list of images used by this repository state
|
||||||
IMGNAMES: |
|
IMGNAMES: |
|
||||||
${FEDORA_CACHE_IMAGE_NAME}
|
${FEDORA_CACHE_IMAGE_NAME}
|
||||||
|
${RAWHIDE_CACHE_IMAGE_NAME}
|
||||||
build-push-${IMAGE_SUFFIX}
|
build-push-${IMAGE_SUFFIX}
|
||||||
BUILDID: "${CIRRUS_BUILD_ID}"
|
BUILDID: "${CIRRUS_BUILD_ID}"
|
||||||
REPOREF: "${CIRRUS_REPO_NAME}"
|
REPOREF: "${CIRRUS_REPO_NAME}"
|
||||||
|
6
Makefile
6
Makefile
@@ -24,6 +24,8 @@ GOBIN := $(shell $(GO) env GOBIN)
|
|||||||
GOOS ?= $(shell go env GOOS)
|
GOOS ?= $(shell go env GOOS)
|
||||||
GOARCH ?= $(shell go env GOARCH)
|
GOARCH ?= $(shell go env GOARCH)
|
||||||
|
|
||||||
|
SEQUOIA_SONAME_DIR =
|
||||||
|
|
||||||
# N/B: This value is managed by Renovate, manual changes are
|
# N/B: This value is managed by Renovate, manual changes are
|
||||||
# possible, as long as they don't disturb the formatting
|
# possible, as long as they don't disturb the formatting
|
||||||
# (i.e. DO NOT ADD A 'v' prefix!)
|
# (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)
|
CONTAINER_RUN ?= $(CONTAINER_CMD) --security-opt label=disable -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN)
|
||||||
|
|
||||||
EXTRA_LDFLAGS ?=
|
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_MD = $(wildcard docs/*.md)
|
||||||
MANPAGES ?= $(MANPAGES_MD:%.md=%)
|
MANPAGES ?= $(MANPAGES_MD:%.md=%)
|
||||||
@@ -251,7 +253,7 @@ validate-docs: bin/skopeo
|
|||||||
hack/xref-helpmsgs-manpages
|
hack/xref-helpmsgs-manpages
|
||||||
|
|
||||||
test-unit-local:
|
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:
|
vendor:
|
||||||
$(GO) mod tidy
|
$(GO) mod tidy
|
||||||
|
@@ -99,7 +99,7 @@ _run_vendor() {
|
|||||||
|
|
||||||
_run_build() {
|
_run_build() {
|
||||||
make bin/skopeo BUILDTAGS="$BUILDTAGS"
|
make bin/skopeo BUILDTAGS="$BUILDTAGS"
|
||||||
make install PREFIX=/usr/local
|
make install PREFIX=/usr/local BUILDTAGS="$BUILDTAGS"
|
||||||
}
|
}
|
||||||
|
|
||||||
_run_cross() {
|
_run_cross() {
|
||||||
|
Reference in New Issue
Block a user