Skip to content

Commit 1752fa6

Browse files
committed
CI: modify android.yml
1 parent b6a196a commit 1752fa6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ jobs:
320320
fi
321321
322322
- name: build qtkeychain
323-
if: false
323+
#if: false
324324
working-directory: ${{env.SOURCE_DIR}}
325325
run: |
326326
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/Qt6Keychain ]; then
@@ -329,7 +329,7 @@ jobs:
329329
cmake -E make_directory build
330330
cd build
331331
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
332-
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
332+
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
333333
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
334334
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
335335
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
@@ -342,13 +342,13 @@ jobs:
342342
- name: Build QFtpServer
343343
working-directory: ${{env.SOURCE_DIR}}
344344
run: |
345-
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/QFtpServerLib/QFtpServerLib ]; then
345+
if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/QFtpServerLib ]; then
346346
git clone --depth=1 https://github.com/KangLin/QFtpServer.git
347347
cd QFtpServer
348348
cmake -E make_directory build
349349
cd build
350350
${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
351-
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
351+
-DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
352352
-DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
353353
-DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
354354
-DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \

0 commit comments

Comments
 (0)