From aa4889b806ba64076ae65ad824de7fa7ad281d23 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Thu, 12 Dec 2024 15:35:24 +0100 Subject: [PATCH] Fix CI Signed-off-by: Maxime Gervais --- .github/workflows/qctools.yml | 64 ++++++++--------------------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml index 6ae44155c..2ce437c12 100644 --- a/.github/workflows/qctools.yml +++ b/.github/workflows/qctools.yml @@ -31,7 +31,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Install dependencies run: | @@ -88,7 +88,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Install dependencies run: | @@ -145,7 +145,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Install dependencies run: | @@ -231,7 +231,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Install dependencies run: | @@ -308,12 +308,12 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - - name: Install Python 3.7 version + - name: Install Python 3.x version uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3' architecture: 'x64' - name: Install compiler and FFmpeg dependencies @@ -348,24 +348,6 @@ jobs: qmake -r make -j4 - - name: Build FFmpeg - run: | - git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg - cd ../ffmpeg - ./configure --enable-gpl \ - --enable-shared \ - --disable-static \ - --disable-autodetect \ - --disable-securetransport \ - --disable-videotoolbox \ - --disable-doc \ - --disable-ffplay \ - --disable-ffprobe \ - --disable-debug \ - --disable-x86asm - - make -j12 - - name: Build QCTools run: | cd Project/QtCreator @@ -401,12 +383,12 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - - name: Install Python 3.7 version + - name: Install Python 3.x version uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3' architecture: 'x64' - name: Install compiler and FFmpeg dependencies @@ -441,24 +423,6 @@ jobs: qmake -r make -j4 - - name: Build FFmpeg - run: | - git clone --depth 1 --branch n5.1 https://github.com/FFmpeg/FFmpeg ../ffmpeg - cd ../ffmpeg - ./configure --enable-gpl \ - --enable-shared \ - --disable-static \ - --disable-autodetect \ - --disable-securetransport \ - --disable-videotoolbox \ - --disable-doc \ - --disable-ffplay \ - --disable-ffprobe \ - --disable-debug \ - --disable-x86asm - - make -j12 - - name: Build QCTools run: | cd Project/QtCreator @@ -486,7 +450,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Build and install zlib shell: cmd @@ -567,7 +531,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Build and install zlib shell: cmd @@ -647,7 +611,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Init vs environment uses: egor-tensin/vs-shell@v2 @@ -732,7 +696,7 @@ jobs: git submodule sync --recursive git -c "http.extraheader=$AUTH_HEADER" \ -c protocol.version=2 \ - submodule update --init --force --recursive --depth=1 + submodule update --init --force --recursive --remote --depth=1 - name: Init vs environment uses: egor-tensin/vs-shell@v2