Skip to content

Commit c55d47f

Browse files
committed
Fix CI
Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>
1 parent 54a87e3 commit c55d47f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/qctools.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ jobs:
494494
run: |
495495
Set-Location ..
496496
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
497-
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
498-
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
497+
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
498+
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64--gpl-shared-6.1.zip")).browser_download_url')
499499
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
500500
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
501501
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"
@@ -576,8 +576,8 @@ jobs:
576576
run: |
577577
Set-Location ..
578578
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
579-
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
580-
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
579+
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
580+
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
581581
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
582582
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
583583
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"
@@ -659,8 +659,8 @@ jobs:
659659
run: |
660660
Set-Location ..
661661
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
662-
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
663-
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
662+
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
663+
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
664664
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
665665
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
666666
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"
@@ -746,8 +746,8 @@ jobs:
746746
run: |
747747
Set-Location ..
748748
$json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest)
749-
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
750-
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url')
749+
$ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")')
750+
$ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-win64-gpl-shared-6.1.zip")).browser_download_url')
751751
Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip"
752752
Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath .
753753
Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg"

Project/QtCreator/qctools-gui/qctools-gui.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ include(../qwt.pri)
215215

216216
CONFIG -= no_keywords
217217

218-
!linux: DEFINES += QT_AVPLAYER_MULTIMEDIA
218+
!linux|lessThan(QT_MAJOR_VERSION, 6): DEFINES += QT_AVPLAYER_MULTIMEDIA
219219

220220
INCLUDEPATH += ../qctools-QtAVPlayer/src
221221
include(../qctools-QtAVPlayer/src/QtAVPlayer/QtAVPlayer.pri)

0 commit comments

Comments
 (0)