diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-10-11 10:53:15 +0200 |
|---|---|---|
| committer | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-11-02 20:11:01 +0000 |
| commit | 2d3245e0eacf14dd0c488b436cf8160a49723bd6 (patch) | |
| tree | 9c8bc68ac92d5158fc2c684d0d131fc373fd32e4 /coin | |
| parent | 185b7219a4f8b65e3dab71d14eeaacbb3d4fed76 (diff) | |
Coin: Install FFmpeg for Android on missing targets
On qtci-macos-13-x86_64 host CI tries to build and run the test on
Android (arm64) while we still haven't managed to install FFmpeg for it.
The same situation happened with qtci-linux-RHEL-8.8-x86_64 and Android
x86.
Task-number: QTBUG-110805
Task-number: QTBUG-114954
Task-number: QTBUG-113980
Pick-to: 6.6 6.5
Change-Id: If953221b104d5bb8fce9d48f8ecd977c2e80c41d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh | 1 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh index a3252c08..06e28f34 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh @@ -4,3 +4,4 @@ source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh index 23cb13e1..8f6da818 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh @@ -5,3 +5,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" |