diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-03 04:01:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-03 04:01:42 -0800 |
| commit | b88f2c4297a14a15015c910b875a40f3992e4b00 (patch) | |
| tree | 2c0f9b710c0952a589df095e1fbdfa06214f3ca7 | |
| parent | 9e361fd8513d74b4a1fb4e6c6dd58cc54635cf03 (diff) | |
| parent | 3befbb19978c596c4bf4331c29097b6cd4d62ff3 (diff) | |
| download | podman-b88f2c4297a14a15015c910b875a40f3992e4b00.tar.gz podman-b88f2c4297a14a15015c910b875a40f3992e4b00.tar.bz2 podman-b88f2c4297a14a15015c910b875a40f3992e4b00.zip | |
Merge pull request #4615 from ssbarnea/fix/prepare
build: improved prepare.sh
| -rw-r--r-- | .copr/prepare.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/.copr/prepare.sh b/.copr/prepare.sh index d8ad34d08..713cdc2ee 100644 --- a/.copr/prepare.sh +++ b/.copr/prepare.sh @@ -1,12 +1,14 @@ #!/bin/sh -euf -set -x +set -euxo pipefail OS_TEST=${OS_TEST:=0} if [ ! -e /usr/bin/git ]; then dnf -y install git-core fi -git fetch --unshallow || : +if [ -f $(git rev-parse --git-dir)/shallow ]; then + git fetch --unshallow +fi COMMIT=$(git rev-parse HEAD) COMMIT_SHORT=$(git rev-parse --short=8 HEAD) @@ -26,7 +28,12 @@ if [ ${OS_TEST} -eq 0 ]; then sed -i "s/${BR}/${NEWBR}/g" contrib/spec/podman.spec fi -mkdir build/ +mkdir -p build/ git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz" -git clone https://github.com/containers/conmon -cd conmon && git checkout 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz" +if [ ! -d conmon ]; then + git clone -n --quiet https://github.com/containers/conmon +fi +pushd conmon +git checkout 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 +git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz" +popd |