From 32651231699b7973b72f5fd92cd0d65cd6e227c1 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Mon, 2 Oct 2023 16:27:51 -0700 Subject: [PATCH] copr: try another way to get Source available to build --- ci/deploy.sh | 4 ++-- ci/source-archive.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 6aa0bce27..7aefb6435 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -155,7 +155,7 @@ EOF echo build EOF - if test -d ${COPR_SRPM} ; then + if test -n "${COPR_SRPM}" ; then TAR_NAME=$(git -c "core.abbrev=8" show -s "--format=%cd_%h" "--date=format:%Y%m%d_%H%M%S") @@ -228,7 +228,7 @@ install -Dm644 assets/wezterm-nautilus.py %{buildroot}/usr/share/nautilus-python /etc/profile.d/* EOF - if test -d ${COPR_SRPM} ; then + if test -n "${COPR_SRPM}" ; then /usr/bin/rpmbuild -bs --rmspec wezterm.spec --verbose mv ~/rpmbuild/SRPMS/wezterm-${TAR_NAME}*.src.rpm "${COPR_SRPM}"/ else diff --git a/ci/source-archive.sh b/ci/source-archive.sh index 8f9d086f9..91fbcff70 100755 --- a/ci/source-archive.sh +++ b/ci/source-archive.sh @@ -53,6 +53,7 @@ tar --delete \ gzip ${TAR_NAME} if test -d ${COPR_SRPM} ; then - mkdir -p ~/rpmbuild/SOURCES - mv ${TAR_NAME}.gz /tmp/ + if test -d /builddir/build/SOURCES ; then + mv ${TAR_NAME}.gz /builddir/build/SOURCES/ + fi fi