Skip to content

Commit c7a68d1

Browse files
committed
fix linux build
1 parent 2ba8b15 commit c7a68d1

File tree

2 files changed

+21
-18
lines changed

2 files changed

+21
-18
lines changed

.github/workflows/release.yaml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
5454
- name: Copy libs
5555
run: |
56+
export LD_LIBRARY_PATH=$FFMPEG_ROOT_PATH/lib/:$BMF_ROOT_PATH/lib
57+
export LIBRARY_PATH=$FFMPEG_ROOT_PATH/lib/:$BMF_ROOT_PATH/lib
5658
# linuxdeployqt
5759
sudo apt-get -y install git g++ libgl1-mesa-dev
5860
git clone https://github.com/probonopd/linuxdeployqt.git
@@ -122,6 +124,7 @@ jobs:
122124
run: |
123125
if [ ! -d "$(pwd)/ffmpeg" ]; then
124126
echo "FFmpeg not found, starting build..."
127+
brew install make pkg-config openssl cmake x264 x265
125128
wget https://ffmpeg.org/releases/ffmpeg-5.1.6.tar.bz2 && tar xjvf ffmpeg-5.1.6.tar.bz2
126129
(cd ffmpeg-5.1.6 && ./configure --pkg-config-flags=--static --enable-shared --disable-static --extra-libs=-lpthread --extra-libs=-lm --enable-gpl --enable-nonfree --enable-libx264 --enable-libx265 --prefix=../ffmpeg)
127130
(cd ffmpeg-5.1.6 && make -j$(sysctl -n hw.ncpu) && make install)
@@ -178,9 +181,9 @@ jobs:
178181
- name: Finish
179182
run: echo "macOS aarch64 Release upload complete"
180183

181-
- name: Setup tmate session
182-
if: ${{ failure() }}
183-
uses: mxschmitt/action-tmate@v3
184+
# - name: Setup tmate session
185+
# if: ${{ failure() }}
186+
# uses: mxschmitt/action-tmate@v3
184187

185188
- name: Finish
186189
run: echo "Release upload complete"
@@ -223,20 +226,20 @@ jobs:
223226
224227
- name : Deploy project
225228
run: |
226-
mkdir D:\deploy\OpenConverter
227-
cd D:\deploy\OpenConverter
228-
cp D:\a\OpenConverter\OpenConverter\src\build\Release\OpenConverter.exe .
229+
mkdir -p deploy
230+
cd src/build/Release
231+
cp OpenConverter.exe ../../../../deploy/
229232
D:\a\_temp\Qt\6.4.3\msvc2019_64\bin\windeployqt.exe .\OpenConverter.exe
230-
cp D:\a\OpenConverter\OpenConverter\ffmpeg\ffmpeg-n4.4.4-94-g5d07afd482-win64-gpl-shared-4.4\bin\*.dll .\
231-
cd D:\deploy
232-
powershell Compress-Archive -Path OpenConverter -DestinationPath OpenConverter_win64.zip
233-
233+
cp D:\a\OpenConverter\OpenConverter\ffmpeg\ffmpeg-n4.4.4-94-g5d07afd482-win64-gpl-shared-4.4\bin\*.dll ../../../../deploy/
234+
cd ${{ github.workspace }}
235+
powershell Compress-Archive -Path deploy -DestinationPath deploy/OpenConverter_win64.zip
236+
234237
# (Optional) Archive the build artifacts.
235238
- name: Upload build artifacts
236239
uses: actions/upload-artifact@v4
237240
with:
238241
name: OpenConverter_win64
239-
path: D:\deploy\OpenConverter_win64.zip
242+
path: deploy\OpenConverter_win64.zip
240243

241244
- name: Get GitHub Release information
242245
id: release_info
@@ -246,14 +249,14 @@ jobs:
246249
uses: softprops/action-gh-release@v1
247250
if: startsWith(github.ref, 'refs/tags/')
248251
with:
249-
files: D:\deploy\OpenConverter_win64.zip
252+
files: deploy\OpenConverter_win64.zip
250253

251254
- name: Finish
252-
run: echo "macOS aarch64 Release upload complete"
255+
run: echo "win64 Release upload complete"
253256

254-
- name: Setup tmate session
255-
if: ${{ failure() }}
256-
uses: mxschmitt/action-tmate@v3
257+
# - name: Setup tmate session
258+
# if: ${{ failure() }}
259+
# uses: mxschmitt/action-tmate@v3
257260

258261
- name: Finish
259262
run: echo "Release upload complete"

.github/workflows/review.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ jobs:
7979
8080
- name: Copy libs
8181
run: |
82-
# export LD_LIBRARY_PATH=$FFMPEG_ROOT_PATH/lib/:$BMF_ROOT_PATH/lib
83-
# export LIBRARY_PATH=$FFMPEG_ROOT_PATH/lib/:$BMF_ROOT_PATH/lib
82+
export LD_LIBRARY_PATH=$FFMPEG_ROOT_PATH/lib/:$BMF_ROOT_PATH/lib
83+
export LIBRARY_PATH=$FFMPEG_ROOT_PATH/lib/:$BMF_ROOT_PATH/lib
8484
# linuxdeployqt
8585
sudo apt-get -y install git g++ libgl1-mesa-dev
8686
git clone https://github.com/probonopd/linuxdeployqt.git

0 commit comments

Comments
 (0)