Путь к qmake задаётся переменной
This commit is contained in:
parent
7fedc96bed
commit
040d974515
@ -5,6 +5,7 @@ variables:
|
|||||||
CI_BUILD_DIR: _build
|
CI_BUILD_DIR: _build
|
||||||
CI_OUTPUT_DIR: _output
|
CI_OUTPUT_DIR: _output
|
||||||
CI_CMAKE: /usr/bin/cmake
|
CI_CMAKE: /usr/bin/cmake
|
||||||
|
CI_QMAKE5: /usr/bin/qmake
|
||||||
|
|
||||||
.add-ssh-key:
|
.add-ssh-key:
|
||||||
before_script:
|
before_script:
|
||||||
@ -38,7 +39,7 @@ variables:
|
|||||||
fi
|
fi
|
||||||
- rm -f ${CI_JOB_NAME}.status
|
- rm -f ${CI_JOB_NAME}.status
|
||||||
- mkdir -p ${CI_BUILD_DIR}
|
- mkdir -p ${CI_BUILD_DIR}
|
||||||
- qmake -o ${CI_BUILD_DIR}/Makefile ${QMAKE_PRO_FILE}
|
- ${CI_QMAKE} -o ${CI_BUILD_DIR}/Makefile ${QMAKE_PRO_FILE}
|
||||||
- make -j8 -C ${CI_BUILD_DIR}
|
- make -j8 -C ${CI_BUILD_DIR}
|
||||||
- echo "${CI_COMMIT_SHA}" > "${CI_JOB_NAME}.status"
|
- echo "${CI_COMMIT_SHA}" > "${CI_JOB_NAME}.status"
|
||||||
|
|
||||||
@ -120,7 +121,8 @@ variables:
|
|||||||
|
|
||||||
.scheduled-mxe-focal:
|
.scheduled-mxe-focal:
|
||||||
variables:
|
variables:
|
||||||
CI_CMAKE: /usr/lib/mxe/usr/x86_64-pc-linux-gnu/bin/cmake
|
CI_QMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5
|
||||||
|
CI_CMAKE: /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake
|
||||||
CI_USE_MXE: 1
|
CI_USE_MXE: 1
|
||||||
extends: .scheduled-test
|
extends: .scheduled-test
|
||||||
image: mxe-focal-dev
|
image: mxe-focal-dev
|
||||||
@ -205,7 +207,7 @@ variables:
|
|||||||
before_script:
|
before_script:
|
||||||
- !reference [.add-ssh-key, before_script]
|
- !reference [.add-ssh-key, before_script]
|
||||||
script:
|
script:
|
||||||
- qmake ${QMAKE_PRO_FILE}
|
- ${CI_QMAKE} ${QMAKE_PRO_FILE}
|
||||||
- bear -- make -k -j$(nproc)
|
- bear -- make -k -j$(nproc)
|
||||||
- pvs-studio-analyzer analyze -a 29 -j$(nproc)
|
- pvs-studio-analyzer analyze -a 29 -j$(nproc)
|
||||||
- plog-converter -a "GA:1,2,3;64:1;OP:1,2;CS:1,2" -t errorfile PVS-Studio.log
|
- plog-converter -a "GA:1,2,3;64:1;OP:1,2;CS:1,2" -t errorfile PVS-Studio.log
|
||||||
@ -217,7 +219,7 @@ variables:
|
|||||||
before_script:
|
before_script:
|
||||||
- !reference [.add-ssh-key, before_script]
|
- !reference [.add-ssh-key, before_script]
|
||||||
script:
|
script:
|
||||||
- qmake ${QMAKE_PRO_FILE}
|
- ${CI_QMAKE} ${QMAKE_PRO_FILE}
|
||||||
- bear -- make -k -j$(nproc)
|
- bear -- make -k -j$(nproc)
|
||||||
- run-clang-tidy-14 -checks=-*,bugprone-*,clang-analyzer-*,misc-*,modernize-*,performance-*,portability-*
|
- run-clang-tidy-14 -checks=-*,bugprone-*,clang-analyzer-*,misc-*,modernize-*,performance-*,portability-*
|
||||||
|
|
||||||
@ -228,7 +230,7 @@ variables:
|
|||||||
before_script:
|
before_script:
|
||||||
- !reference [.add-ssh-key, before_script]
|
- !reference [.add-ssh-key, before_script]
|
||||||
script:
|
script:
|
||||||
- qmake ${QMAKE_PRO_FILE}
|
- ${CI_QMAKE} ${QMAKE_PRO_FILE}
|
||||||
- bear -- make -k -j$(nproc)
|
- bear -- make -k -j$(nproc)
|
||||||
- find . -name "*.cpp" -print0 | xargs -0 clazy-standalone --ignore-dirs=/usr -checks=level2 -p compile_commands.json
|
- find . -name "*.cpp" -print0 | xargs -0 clazy-standalone --ignore-dirs=/usr -checks=level2 -p compile_commands.json
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user