Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package obs-service-download_files for openSUSE:Factory checked in at 2022-12-08 16:52:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-download_files (Old) and /work/SRC/openSUSE:Factory/.obs-service-download_files.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-download_files" Thu Dec 8 16:52:33 2022 rev:31 rq:1041652 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-download_files/obs-service-download_files.changes 2021-10-15 23:04:15.286109918 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-download_files.new.1835/obs-service-download_files.changes 2022-12-08 16:52:41.315945154 +0100 @@ -1,0 +2,7 @@ +Mon Dec 5 07:22:33 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 0.9.2: + * Reliably detect download failures by using curl -f + * testing in docker + +------------------------------------------------------------------- Old: ---- _service obs-service-download_files-0.9.1.tar.gz New: ---- obs-service-download_files-0.9.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-download_files.spec ++++++ --- /var/tmp/diff_new_pack.I2HgiT/_old 2022-12-08 16:52:41.799947636 +0100 +++ /var/tmp/diff_new_pack.I2HgiT/_new 2022-12-08 16:52:41.803947657 +0100 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,12 +23,12 @@ %define build_pkg_name build %endif Name: obs-service-%{service} -Version: 0.9.1 +Version: 0.9.2 Release: 0 Summary: An OBS source service: download files License: GPL-2.0-or-later URL: https://github.com/openSUSE/obs-service-%{service} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: %{build_pkg_name} BuildRequires: bzip2 BuildRequires: tar ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.I2HgiT/_old 2022-12-08 16:52:41.851947903 +0100 +++ /var/tmp/diff_new_pack.I2HgiT/_new 2022-12-08 16:52:41.855947924 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-download-files -Version: 0.9.1-0 +Version: 0.9.2-0 Binary: obs-service-download-files Maintainer: Hib Eris <h...@hiberis.nl> Architecture: all ++++++ obs-service-download_files-0.9.1.tar.gz -> obs-service-download_files-0.9.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-download_files-0.9.1/.github/Dockerfile new/obs-service-download_files-0.9.2/.github/Dockerfile --- old/obs-service-download_files-0.9.1/.github/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-download_files-0.9.2/.github/Dockerfile 2022-12-05 08:16:37.000000000 +0100 @@ -0,0 +1,3 @@ +FROM opensuse/tumbleweed +COPY entrypoint.sh /entrypoint.sh +ENTRYPOINT ["/entrypoint.sh"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-download_files-0.9.1/.github/entrypoint.sh new/obs-service-download_files-0.9.2/.github/entrypoint.sh --- old/obs-service-download_files-0.9.1/.github/entrypoint.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-download_files-0.9.2/.github/entrypoint.sh 2022-12-05 08:16:37.000000000 +0100 @@ -0,0 +1,4 @@ +#!/bin/bash +ls -la /gh-actions +zypper -n install make perl-HTTP-Server-Simple perl-Path-Class perl-File-Type build curl gzip bzip2 +make -C /gh-actions test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-download_files-0.9.1/.github/workflows/main.yml new/obs-service-download_files-0.9.2/.github/workflows/main.yml --- old/obs-service-download_files-0.9.1/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-download_files-0.9.2/.github/workflows/main.yml 2022-12-05 08:16:37.000000000 +0100 @@ -0,0 +1,17 @@ +name: Example setup with docker + +on: [push, pull_request] + +jobs: + tests: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Build Container + run: docker build -t test:latest .github + + - name: Start Container + run: docker run --privileged -v $(pwd):/gh-actions test:latest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-download_files-0.9.1/download_files new/obs-service-download_files-0.9.2/download_files --- old/obs-service-download_files-0.9.1/download_files 2021-10-14 13:14:24.000000000 +0200 +++ new/obs-service-download_files-0.9.2/download_files 2022-12-05 08:16:37.000000000 +0100 @@ -103,6 +103,9 @@ elif [[ "${FILE%.xz}" != "${input}" ]]; then uncompress="xz -dc" basename="${input%.xz}" + elif [[ "${FILE%.zst}" != "${input}" ]]; then + uncompress="zstd -dc" + basename="${input%.zst}" fi $uncompress "$input" > "$output" @@ -267,7 +270,7 @@ # enforce a download via enforceupstream. [ -e "$SRCDIR/$FILE" -a "$ENFORCELOCAL" != "yes" -a "$ENFORCEUPSTREAM" != "yes" ] && CURLCMD=("${CURL[@]}" --time-cond $SRCDIR/$FILE) || CURLCMD=("${CURL[@]}") - if ! "${CURLCMD[@]}" -R --output "$FILE" "$url"; then + if ! "${CURLCMD[@]}" -f -R --output "$FILE" "$url"; then rm -f "$FILE" echo "ERROR: Failed to download \"$url\"" exit 1 @@ -277,7 +280,7 @@ FORMAT="${url##*\.}" SUCCESS=0 - for i in "" ".gz" ".bz2" ".xz" + for i in "" ".gz" ".bz2" ".xz" ".zst" do if [ -n "$i" ];then OF="${FILE%\.$FORMAT}$i" @@ -288,8 +291,7 @@ URL=$url FMT= fi - HTTP_CODE=$("${CURL[@]}" -R --output "$OF" "$URL" --write-out "%{http_code}") - if [[ ${HTTP_CODE} -ge 200 && ${HTTP_CODE} -lt 299 ]] ; then + if "${CURL[@]}" -f -R --output "$OF" "$URL" ; then SUCCESS=1 FILE=$OF RECOMPRESS="$FMT" @@ -336,6 +338,9 @@ elif [ "$RECOMPRESS" == "xz" ]; then COMPRESS="xz -c -" SUFFIX=".xz" + elif [ "$RECOMPRESS" == "zst" ]; then + COMPRESS="zstd -12 -c -" + SUFFIX=".zst" elif [ "$RECOMPRESS" == "none" ]; then COMPRESS="cat -" SUFFIX=""