Merge branch '178-ci-requires-remote-resources-to-succeed-in-tools-update-upstreams-sh' into 'master'

Resolve "CI requires remote resources to succeed in ./tools/update-upstreams.sh"

Closes #178

See merge request sane-project/backends!253
merge-requests/228/merge
Olaf Meeuwissen 2019-12-02 11:59:50 +00:00
commit fa75eff7b4
2 zmienionych plików z 2 dodań i 3 usunięć

Wyświetl plik

@ -25,7 +25,6 @@ make-dist:
- git ls-files | xargs ./tools/style-check.sh
- ./autogen.sh
- ./tools/create-changelog.sh
- ./tools/update-upstreams.sh
- ./configure
- make dist
artifacts:

Wyświetl plik

@ -6,11 +6,11 @@
fetch () {
if type curl 2>/dev/null >/dev/null ; then
curl --silent --location --remote-name $1
curl --location --remote-name $1
return
fi
if type wget 2>/dev/null >/dev/null ; then
wget --quiet --output-document $(echo $1 | sed 's,.*/,,') $1
wget --output-document $(echo $1 | sed 's,.*/,,') $1
fi
}