Skip to content

Commit a10bc18

Browse files
committed
GH arm+coverity builds: add -f to curl
in order to fail on 4xx HTTP errors
1 parent 8adbafc commit a10bc18

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/scripts/Linux/arm/bootstrap.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ deb http://security.debian.org/debian-security $debver-security main contrib non
1313
deb http://deb.debian.org/debian $debver-updates main contrib non-free
1414
EOF
1515
fi
16-
curl http://archive.raspberrypi.org/debian/raspberrypi.gpg.key -o \
16+
curl -f http://archive.raspberrypi.org/debian/raspberrypi.gpg.key -o \
1717
/usr/share/keyrings/raspberrypi.gpg.key
1818
cat >>/etc/apt/sources.list <<EOF
1919
deb [signed-by=/usr/share/keyrings/raspberrypi.gpg.key] \
@@ -43,11 +43,11 @@ mkai_arch=$(dpkg --print-architecture)
4343
if [ "$mkai_arch" = arm64 ]; then
4444
mkai_arch=aarch64
4545
fi
46-
mkai_url=$(curl -H "Authorization: token $GITHUB_TOKEN"\
46+
mkai_url=$(curl -f -H "Authorization: token $GITHUB_TOKEN"\
4747
https://api.github.com/repos/probonopd/go-appimage/releases/tags/continuous |
4848
grep "browser_download_url.*mkappimage-.*-$mkai_arch.AppImage" | head -n 1 |
4949
cut -d '"' -f 4)
50-
curl -L "$mkai_url" > mkappimage
50+
curl -Lf "$mkai_url" > mkappimage
5151
chmod 755 mkappimage
5252
#shellcheck disable=SC2211
5353
/usr/bin/qemu-*-static ./mkappimage --appimage-extract

.github/workflows/arm-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ jobs:
5050
key: cache-ndi-${{ runner.os }}-${{ steps.etags.outputs.ndi }}
5151
- name: Download NDI
5252
if: steps.cache-ndi.outputs.cache-hit != 'true'
53-
run: curl -L https://downloads.ndi.tv/SDK/NDI_SDK_Linux/Install_NDI_SDK_v5_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz
53+
run: "curl -Lf https://downloads.ndi.tv/SDK/NDI_SDK_Linux/\
54+
Install_NDI_SDK_v5_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz"
5455

5556
- name: Run actions/cache for ARM Chroot
5657
id: cache-bootstrap

.github/workflows/coverity-scan.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
if: ${{ env.coverity_token }}
2121
id: tool
2222
run: |
23-
FILENAME=$(curl -LI "https://scan.coverity.com/download/linux64?token=$coverity_token&project=UltraGrid" | sed -n '/content-disposition/s/.*\"\(.*\)\"/\1/p')
23+
FILENAME=$(curl -LIf "https://scan.coverity.com/download/linux64\
24+
?token=$coverity_token&project=UltraGrid" |
25+
sed -n '/content-disposition/s/.*\"\(.*\)\"/\1/p')
2426
echo "filename=$FILENAME" >> $GITHUB_OUTPUT
2527
- name: Run actions/cache for Coverity build tool
2628
if: ${{ env.coverity_token }}
@@ -58,7 +60,8 @@ jobs:
5860
key: cache-ndi-${{ runner.os }}-${{ steps.etags.outputs.ndi }}
5961
- name: Download NDI
6062
if: ${{ env.coverity_token }} && steps.cache-ndi.outputs.cache-hit != 'true'
61-
run: curl -L https://downloads.ndi.tv/SDK/NDI_SDK_Linux/Install_NDI_SDK_v6_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz
63+
run: "curl -Lf https://downloads.ndi.tv/SDK/NDI_SDK_Linux/\
64+
Install_NDI_SDK_v6_Linux.tar.gz -o /var/tmp/Install_NDI_SDK_Linux.tar.gz"
6265

6366
- name: bootstrap
6467
run: |
@@ -77,7 +80,7 @@ jobs:
7780
if: ${{ env.coverity_token }}
7881
run: |
7982
tar caf ultragrid.tar.xz cov-int
80-
result=$(curl -S --form token=$coverity_token \
83+
result=$(curl -Sf --form token=$coverity_token \
8184
8285
8386
--form version="$(date +%F)" \

0 commit comments

Comments
 (0)