Skip to content

Commit aa4889b

Browse files
committed
Fix CI
Signed-off-by: Maxime Gervais <[email protected]>
1 parent 59a1091 commit aa4889b

File tree

1 file changed

+14
-50
lines changed

1 file changed

+14
-50
lines changed

.github/workflows/qctools.yml

Lines changed: 14 additions & 50 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: |
@@ -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: |
@@ -308,12 +308,12 @@ 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
@@ -348,24 +348,6 @@ jobs:
348348
qmake -r
349349
make -j4
350350
351-
- name: Build FFmpeg
352-
run: |
353-
git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
354-
cd ../ffmpeg
355-
./configure --enable-gpl \
356-
--enable-shared \
357-
--disable-static \
358-
--disable-autodetect \
359-
--disable-securetransport \
360-
--disable-videotoolbox \
361-
--disable-doc \
362-
--disable-ffplay \
363-
--disable-ffprobe \
364-
--disable-debug \
365-
--disable-x86asm
366-
367-
make -j12
368-
369351
- name: Build QCTools
370352
run: |
371353
cd Project/QtCreator
@@ -401,12 +383,12 @@ jobs:
401383
git submodule sync --recursive
402384
git -c "http.extraheader=$AUTH_HEADER" \
403385
-c protocol.version=2 \
404-
submodule update --init --force --recursive --depth=1
386+
submodule update --init --force --recursive --remote --depth=1
405387
406-
- name: Install Python 3.7 version
388+
- name: Install Python 3.x version
407389
uses: actions/setup-python@v1
408390
with:
409-
python-version: '3.7'
391+
python-version: '3'
410392
architecture: 'x64'
411393

412394
- name: Install compiler and FFmpeg dependencies
@@ -441,24 +423,6 @@ jobs:
441423
qmake -r
442424
make -j4
443425
444-
- name: Build FFmpeg
445-
run: |
446-
git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg
447-
cd ../ffmpeg
448-
./configure --enable-gpl \
449-
--enable-shared \
450-
--disable-static \
451-
--disable-autodetect \
452-
--disable-securetransport \
453-
--disable-videotoolbox \
454-
--disable-doc \
455-
--disable-ffplay \
456-
--disable-ffprobe \
457-
--disable-debug \
458-
--disable-x86asm
459-
460-
make -j12
461-
462426
- name: Build QCTools
463427
run: |
464428
cd Project/QtCreator
@@ -486,7 +450,7 @@ jobs:
486450
git submodule sync --recursive
487451
git -c "http.extraheader=$AUTH_HEADER" \
488452
-c protocol.version=2 \
489-
submodule update --init --force --recursive --depth=1
453+
submodule update --init --force --recursive --remote --depth=1
490454
491455
- name: Build and install zlib
492456
shell: cmd
@@ -567,7 +531,7 @@ jobs:
567531
git submodule sync --recursive
568532
git -c "http.extraheader=$AUTH_HEADER" \
569533
-c protocol.version=2 \
570-
submodule update --init --force --recursive --depth=1
534+
submodule update --init --force --recursive --remote --depth=1
571535
572536
- name: Build and install zlib
573537
shell: cmd
@@ -647,7 +611,7 @@ jobs:
647611
git submodule sync --recursive
648612
git -c "http.extraheader=$AUTH_HEADER" \
649613
-c protocol.version=2 \
650-
submodule update --init --force --recursive --depth=1
614+
submodule update --init --force --recursive --remote --depth=1
651615
652616
- name: Init vs environment
653617
uses: egor-tensin/vs-shell@v2
@@ -732,7 +696,7 @@ jobs:
732696
git submodule sync --recursive
733697
git -c "http.extraheader=$AUTH_HEADER" \
734698
-c protocol.version=2 \
735-
submodule update --init --force --recursive --depth=1
699+
submodule update --init --force --recursive --remote --depth=1
736700
737701
- name: Init vs environment
738702
uses: egor-tensin/vs-shell@v2

0 commit comments

Comments
 (0)