Skip to content

Commit 4bfc978

Browse files
g-maximeg-maxime
committed
Fix CI
Signed-off-by: Maxime Gervais <[email protected]>
1 parent 59a1091 commit 4bfc978

File tree

1 file changed

+20
-39
lines changed

1 file changed

+20
-39
lines changed

‎.github/workflows/qctools.yml

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
git submodule sync --recursive
3232
git -c "http.extraheader=$AUTH_HEADER" \
3333
-c protocol.version=2 \
34-
submodule update --init --force --recursive --depth=1
34+
submodule update --init --force --recursive --remote --depth=1
3535
3636
- name: Install dependencies
3737
run: |
@@ -88,7 +88,7 @@ jobs:
8888
git submodule sync --recursive
8989
git -c "http.extraheader=$AUTH_HEADER" \
9090
-c protocol.version=2 \
91-
submodule update --init --force --recursive --depth=1
91+
submodule update --init --force --recursive --remote --depth=1
9292
9393
- name: Install dependencies
9494
run: |
@@ -145,7 +145,7 @@ jobs:
145145
git submodule sync --recursive
146146
git -c "http.extraheader=$AUTH_HEADER" \
147147
-c protocol.version=2 \
148-
submodule update --init --force --recursive --depth=1
148+
submodule update --init --force --recursive --remote --depth=1
149149
150150
- name: Install dependencies
151151
run: |
@@ -178,7 +178,7 @@ jobs:
178178
179179
- name: Build FFmpeg
180180
run: |
181-
git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
181+
git clone --depth 1 --branch n6.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
182182
cd ../ffmpeg
183183
./configure --enable-gpl \
184184
--enable-static \
@@ -231,7 +231,7 @@ jobs:
231231
git submodule sync --recursive
232232
git -c "http.extraheader=$AUTH_HEADER" \
233233
-c protocol.version=2 \
234-
submodule update --init --force --recursive --depth=1
234+
submodule update --init --force --recursive --remote --depth=1
235235
236236
- name: Install dependencies
237237
run: |
@@ -256,7 +256,7 @@ jobs:
256256
257257
- name: Build FFmpeg
258258
run: |
259-
git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
259+
git clone --depth 1 --branch n6.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
260260
cd ../ffmpeg
261261
./configure --enable-gpl \
262262
--enable-static \
@@ -308,28 +308,18 @@ jobs:
308308
git submodule sync --recursive
309309
git -c "http.extraheader=$AUTH_HEADER" \
310310
-c protocol.version=2 \
311-
submodule update --init --force --recursive --depth=1
311+
submodule update --init --force --recursive --remote --depth=1
312312
313-
- name: Install Python 3.7 version
313+
- name: Install Python 3.x version
314314
uses: actions/setup-python@v1
315315
with:
316-
python-version: '3.7'
316+
python-version: '3'
317317
architecture: 'x64'
318318

319319
- name: Install compiler and FFmpeg dependencies
320320
run: |
321321
sudo apt-get update &&
322-
sudo apt-get install -y ${{ matrix.packages }} \
323-
libunwind-dev \
324-
libavcodec-dev \
325-
libavformat-dev \
326-
libavdevice-dev \
327-
libegl1-mesa-dev \
328-
libglew-dev \
329-
libxv-dev \
330-
libraw1394-dev \
331-
libavc1394-dev \
332-
libiec61883-dev
322+
sudo apt-get install -y ${{ matrix.packages }}
333323
334324
- name: Install Qt 5.15
335325
uses: jurplel/install-qt-action@v3
@@ -350,7 +340,7 @@ jobs:
350340
351341
- name: Build FFmpeg
352342
run: |
353-
git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
343+
git clone --depth 1 --branch n6.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
354344
cd ../ffmpeg
355345
./configure --enable-gpl \
356346
--enable-shared \
@@ -401,27 +391,18 @@ jobs:
401391
git submodule sync --recursive
402392
git -c "http.extraheader=$AUTH_HEADER" \
403393
-c protocol.version=2 \
404-
submodule update --init --force --recursive --depth=1
394+
submodule update --init --force --recursive --remote --depth=1
405395
406-
- name: Install Python 3.7 version
396+
- name: Install Python 3.x version
407397
uses: actions/setup-python@v1
408398
with:
409-
python-version: '3.7'
399+
python-version: '3'
410400
architecture: 'x64'
411401

412402
- name: Install compiler and FFmpeg dependencies
413403
run: |
414404
sudo apt-get update &&
415-
sudo apt-get install -y ${{ matrix.packages }} \
416-
libunwind-dev \
417-
libgstreamer-plugins-base1.0-dev \
418-
libavcodec-dev \
419-
libavformat-dev \
420-
libavdevice-dev \
421-
libegl1-mesa-dev \
422-
libglew-dev \
423-
libxkbcommon-dev \
424-
libxv-dev
405+
sudo apt-get install -y ${{ matrix.packages }}
425406
426407
- name: Install Qt 6
427408
uses: jurplel/install-qt-action@v3
@@ -443,7 +424,7 @@ jobs:
443424
444425
- name: Build FFmpeg
445426
run: |
446-
git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
427+
git clone --depth 1 --branch n6.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
447428
cd ../ffmpeg
448429
./configure --enable-gpl \
449430
--enable-shared \
@@ -486,7 +467,7 @@ jobs:
486467
git submodule sync --recursive
487468
git -c "http.extraheader=$AUTH_HEADER" \
488469
-c protocol.version=2 \
489-
submodule update --init --force --recursive --depth=1
470+
submodule update --init --force --recursive --remote --depth=1
490471
491472
- name: Build and install zlib
492473
shell: cmd
@@ -567,7 +548,7 @@ jobs:
567548
git submodule sync --recursive
568549
git -c "http.extraheader=$AUTH_HEADER" \
569550
-c protocol.version=2 \
570-
submodule update --init --force --recursive --depth=1
551+
submodule update --init --force --recursive --remote --depth=1
571552
572553
- name: Build and install zlib
573554
shell: cmd
@@ -647,7 +628,7 @@ jobs:
647628
git submodule sync --recursive
648629
git -c "http.extraheader=$AUTH_HEADER" \
649630
-c protocol.version=2 \
650-
submodule update --init --force --recursive --depth=1
631+
submodule update --init --force --recursive --remote --depth=1
651632
652633
- name: Init vs environment
653634
uses: egor-tensin/vs-shell@v2
@@ -732,7 +713,7 @@ jobs:
732713
git submodule sync --recursive
733714
git -c "http.extraheader=$AUTH_HEADER" \
734715
-c protocol.version=2 \
735-
submodule update --init --force --recursive --depth=1
716+
submodule update --init --force --recursive --remote --depth=1
736717
737718
- name: Init vs environment
738719
uses: egor-tensin/vs-shell@v2

0 commit comments

Comments
 (0)