Fix remaining 3 CI failures: qmake, DEPSDIR, lrelease
- Windows Qt: use qmake-qt5/windeployqt-qt5 (MSYS2 binary names) - Windows daemon: override DEPSDIR=/mingw64 for CI, separate steps - Linux Qt: add qttools5-dev-tools for lrelease (qm file generation) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -46,7 +46,7 @@ jobs:
|
||||
|
||||
- name: Run qmake
|
||||
run: |
|
||||
/mingw64/bin/qmake triangles-qt.pro "RELEASE=1"
|
||||
qmake-qt5 triangles-qt.pro "RELEASE=1"
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
@@ -56,7 +56,7 @@ jobs:
|
||||
run: |
|
||||
mkdir -p dist
|
||||
cp release/triangles-qt.exe dist/
|
||||
windeployqt dist/triangles-qt.exe || true
|
||||
windeployqt-qt5 dist/triangles-qt.exe || true
|
||||
# Copy runtime DLLs
|
||||
for dll in libgcc_s_seh-1.dll libstdc++-6.dll libwinpthread-1.dll; do
|
||||
cp /mingw64/bin/$dll dist/ 2>/dev/null || true
|
||||
@@ -92,12 +92,14 @@ jobs:
|
||||
mingw-w64-x86_64-miniupnpc
|
||||
make
|
||||
|
||||
- name: Build and strip daemon
|
||||
- name: Build daemon
|
||||
run: |
|
||||
cd src
|
||||
mkdir -p obj
|
||||
make -f makefile.mingw -j$(nproc)
|
||||
strip --strip-all trianglesd.exe
|
||||
make -f makefile.mingw DEPSDIR=/mingw64 -j$(nproc)
|
||||
|
||||
- name: Strip daemon
|
||||
run: strip --strip-all src/trianglesd.exe
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
@@ -114,8 +116,8 @@ jobs:
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y build-essential qt5-qmake qtbase5-dev \
|
||||
libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
|
||||
libevent-dev libminiupnpc-dev
|
||||
qttools5-dev-tools libboost-all-dev libssl-dev libdb++-dev \
|
||||
libleveldb-dev libevent-dev libminiupnpc-dev
|
||||
|
||||
- name: Build LevelDB
|
||||
run: |
|
||||
|
||||
Reference in New Issue
Block a user