From 842dfdad84fb4989f4c93bae8b57056d67da8cd3 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 30 Mar 2025 17:03:32 -0400 Subject: [PATCH] Fix incorrect removal of multiple scrap versions --- .github/workflows/release-build.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index 997a033..7b427af 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -153,7 +153,9 @@ jobs: OBSOLETE=( sed "1,${NKEEP}d" <<<"${LIST}" ) for VERSION in ${OBSOLETE[@]}; do for PACKAGE in jellyfin jellyfin-server jellyfin-web; do - sudo reprepro --waitforlock 30 --basedir /srv/debian --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${VERSION} + for SCRAP_VERSION in $( sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} list ${{ matrix.release }} | grep "${PACKAGE} " | grep "${VERSION}" | sort | uniq ); do + sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${SCRAP_VERSION} + done done done fi @@ -168,7 +170,9 @@ jobs: LAST_POINT_VERSION=$(( NEW_POINT_VERSION - 1 )) LAST_VERSION="${NEW_MAJOR_VERSION}.${LAST_POINT_VERSION}" for PACKAGE in jellyfin jellyfin-server jellyfin-web; do - sudo reprepro --waitforlock 30 --basedir /srv/debian --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${LAST_VERSION} + for SCRAP_VERSION in $( sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} list ${{ matrix.release }} | grep "${PACKAGE} " | grep "${LAST_VERSION}" | sort | uniq ); do + sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${SCRAP_VERSION} + done done fi fi @@ -294,7 +298,9 @@ jobs: OBSOLETE=( sed "1,${NKEEP}d" <<<"${LIST}" ) for VERSION in ${OBSOLETE[@]}; do for PACKAGE in jellyfin jellyfin-server jellyfin-web; do - sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${VERSION} + for SCRAP_VERSION in $( sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} list ${{ matrix.release }} | grep "${PACKAGE} " | grep "${VERSION}" | sort | uniq ); do + sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${SCRAP_VERSION} + done done done fi @@ -309,7 +315,9 @@ jobs: LAST_POINT_VERSION=$(( NEW_POINT_VERSION - 1 )) LAST_VERSION="${NEW_MAJOR_VERSION}.${LAST_POINT_VERSION}" for PACKAGE in jellyfin jellyfin-server jellyfin-web; do - sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${LAST_VERSION} + for SCRAP_VERSION in $( sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} list ${{ matrix.release }} | grep "${PACKAGE} " | grep "${LAST_VERSION}" | sort | uniq ); do + sudo reprepro --waitforlock 30 --basedir /srv/ubuntu --component ${COMPONENT} remove ${{ matrix.release }} ${PACKAGE}=${SCRAP_VERSION} + done done fi fi