diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-10 21:54:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 21:54:50 +0100 |
| commit | d083d6a8fc965a7eb42045a72f4685052860a2bd (patch) | |
| tree | 702641bb92bc2f4648e92b7d81fc65f19b49cf00 | |
| parent | 273394d5667923288fb0cf540335259e67d26c6f (diff) | |
| parent | 2c85674773d44168eebbdacf311723457a410b3d (diff) | |
| download | podman-d083d6a8fc965a7eb42045a72f4685052860a2bd.tar.gz podman-d083d6a8fc965a7eb42045a72f4685052860a2bd.tar.bz2 podman-d083d6a8fc965a7eb42045a72f4685052860a2bd.zip | |
Merge pull request #5450 from baude/arm
build for amd64|arm|ppc64le
| -rw-r--r-- | .cirrus.yml | 3 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 84a31e3ac..5ec35cccb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -107,7 +107,7 @@ gating_task: # The entrypoint.sh script ensures a prestine copy of $SRCPATH is # available at $GOSRC before executing make instructions. image: "quay.io/libpod/gate:master" - cpu: 4 + cpu: 8 memory: 12 timeout_in: 20m @@ -138,6 +138,7 @@ gating_task: # N/B: need 'clean' so some committed files are re-generated. - '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}' - '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}' + - '/usr/local/bin/entrypoint.sh local-cross |& ${TIMESTAMP}' - '/usr/local/bin/entrypoint.sh podman-remote-darwin |& ${TIMESTAMP}' - '/usr/local/bin/entrypoint.sh podman-remote-windows |& ${TIMESTAMP}' @@ -108,8 +108,9 @@ endif GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man') CROSS_BUILD_TARGETS := \ - bin/podman.cross.darwin.amd64 \ - bin/podman.cross.linux.amd64 + bin/podman.cross.linux.amd64 \ + bin/podman.cross.linux.ppc64le \ + bin/podman.cross.linux.arm .PHONY: all all: binaries docs |