Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some ci errors #714

Merged
merged 2 commits into from
Jul 9, 2023
Merged

Fix some ci errors #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c54c18c
Fix some ci errors
g-maxime Jul 9, 2023
69008fe
CI: pin to Qt 6.2 for now
g-maxime Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/DVRescue_Checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get update
sudo apt-get install -y pkg-config libxml2-utils libfreetype6-dev libraw1394-dev libavc1394-dev libiec61883-dev
sudo apt-get install -y pkg-config libxml2-utils libfreetype-dev libharfbuzz-dev libraw1394-dev libavc1394-dev libiec61883-dev
fi
if [ "$RUNNER_OS" == "macOS" ]; then
brew install automake freetype
fi
- name: FFmpeg
run: |
git -C .. clone --depth=1 https://git.ffmpeg.org/ffmpeg.git
pushd ../ffmpeg && ./configure --prefix=.. --disable-doc --disable-x86asm --disable-ffplay --disable-ffprobe --enable-static --disable-everything --enable-protocol=file --enable-libfreetype --enable-indev=lavfi --enable-filter=testsrc2,scale,aresample,sine,drawtext,colorspace --enable-demuxer=dv --enable-muxer=dv --enable-encoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* --enable-decoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* && make && popd
pushd ../ffmpeg && ./configure --prefix=.. --disable-doc --disable-x86asm --disable-ffplay --disable-ffprobe --enable-static --disable-everything --enable-protocol=file --enable-libfreetype --enable-libharfbuzz --enable-indev=lavfi --enable-filter=testsrc2,scale,aresample,sine,drawtext,colorspace --enable-demuxer=dv --enable-muxer=dv --enable-encoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* --enable-decoder=rawvideo,wrapped_avframe,dvvideo,dvaudio,pcm_* && make && popd
cp ../ffmpeg/ffmpeg Project/GNU/CLI/
- name: ZenLib
run: |
Expand Down
37 changes: 21 additions & 16 deletions .github/workflows/dvrescue-gui.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,18 @@ jobs:

- name: Install dependencies
run: |
brew install ${{ matrix.packages }} pkg-config qt ffmpeg
brew install ${{ matrix.packages }} pkg-config ffmpeg

- name: Install Qt 6.2
uses: jurplel/install-qt-action@v3
with:
version: 6.2.0
modules: 'addons.qtmultimedia'

- name: Install qwt
run: |
brew install qwt

- name: Set Qt6 environment path
run: |
echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH

- name: Build dvrescue-gui
env:
USE_BREW: true
Expand Down Expand Up @@ -229,14 +231,15 @@ jobs:
git -c "http.extraheader=$AUTH_HEADER" \
-c protocol.version=2 \
submodule update --init --force --recursive --depth=1

- name: Install dependencies
run: |
brew install ${{ matrix.packages }} nasm qt
brew install ${{ matrix.packages }} nasm

- name: Set Qt6 environment path
run: |
echo "/usr/local/opt/qt6/bin" >> $GITHUB_PATH
- name: Install Qt 6.2
uses: jurplel/install-qt-action@v3
with:
version: 6.2.0
modules: 'addons.qtmultimedia'

- name: Build qwt
run: |
Expand Down Expand Up @@ -318,6 +321,7 @@ jobs:
sudo apt-get update &&
sudo apt-get install -y ${{ matrix.packages }} \
libunwind-dev \
libfreetype-dev \
libavcodec-dev \
libavformat-dev \
libavdevice-dev \
Expand All @@ -329,7 +333,7 @@ jobs:
libiec61883-dev

- name: Install Qt 5.15
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
version: 5.15.2

Expand Down Expand Up @@ -399,6 +403,7 @@ jobs:
sudo apt-get update &&
sudo apt-get install -y ${{ matrix.packages }} \
libunwind-dev \
libfreetype-dev \
libgstreamer-plugins-base1.0-dev \
libavcodec-dev \
libavformat-dev \
Expand All @@ -409,7 +414,7 @@ jobs:
libxv-dev

- name: Install Qt 6.2
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
version: 6.2.0
modules: 'addons.qtmultimedia qt5compat'
Expand Down Expand Up @@ -461,7 +466,7 @@ jobs:
submodule update --init --force --recursive --depth=1

- name: Install Qt 5.15
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
arch: win64_mingw81
version: 5.15.2
Expand Down Expand Up @@ -541,7 +546,7 @@ jobs:
submodule update --init --force --recursive --depth=1

- name: Install Qt 6.2
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
arch: win64_mingw81
version: 6.2.0
Expand Down Expand Up @@ -641,7 +646,7 @@ jobs:
nmake install

- name: Install Qt 5.15
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
version: 5.15.2

Expand Down Expand Up @@ -732,7 +737,7 @@ jobs:
nmake install

- name: Install Qt 6.2
uses: jurplel/install-qt-action@v2
uses: jurplel/install-qt-action@v3
with:
version: 6.2.0
modules: 'addons.qtmultimedia'
Expand Down
Loading