mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-07 03:22:33 +01:00
Fix ci python scripts and fix linux apt-get
This commit is contained in:
parent
6a9bf15ba2
commit
1369e22212
@ -13,8 +13,8 @@ check:
|
|||||||
script:
|
script:
|
||||||
- cd Tools
|
- cd Tools
|
||||||
- pip install cmakelang
|
- pip install cmakelang
|
||||||
- python format_cmake.py
|
- python clang_format.py
|
||||||
- python format_cpp.py
|
- python cmake_format.py
|
||||||
|
|
||||||
build:windows_debug:
|
build:windows_debug:
|
||||||
stage: build
|
stage: build
|
||||||
@ -95,9 +95,9 @@ build:linux_debug:
|
|||||||
- export DEBIAN_FRONTEND=noninteractive
|
- export DEBIAN_FRONTEND=noninteractive
|
||||||
- apt install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip -y
|
- apt install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip -y
|
||||||
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
||||||
- sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
- apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
||||||
- sudo apt-get update -y
|
- apt update -y
|
||||||
- sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
|
- apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
|
||||||
- pip3 install aqtinstall
|
- pip3 install aqtinstall
|
||||||
- mkdir Qt
|
- mkdir Qt
|
||||||
- aqt install --outputdir Qt/ 5.15.2 linux desktop
|
- aqt install --outputdir Qt/ 5.15.2 linux desktop
|
||||||
@ -105,6 +105,7 @@ build:linux_debug:
|
|||||||
- wget https://github.com/QuasarApp/CQtDeployer/releases/download/1.5.2/CQtDeployer_1.5.2_OfflineInstaller_Linux64.run
|
- wget https://github.com/QuasarApp/CQtDeployer/releases/download/1.5.2/CQtDeployer_1.5.2_OfflineInstaller_Linux64.run
|
||||||
- python setup.py
|
- python setup.py
|
||||||
- python build.py -t debug
|
- python build.py -t debug
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
expire_in: "4 weeks"
|
expire_in: "4 weeks"
|
||||||
paths:
|
paths:
|
||||||
@ -121,15 +122,19 @@ build:linux_release:
|
|||||||
needs:
|
needs:
|
||||||
- check
|
- check
|
||||||
script:
|
script:
|
||||||
- sudo apt-get update -y
|
- apt update -y
|
||||||
- sudo apt-get install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common snapd -y
|
# Otherwise libglib2 needs interaction
|
||||||
- sudo /etc/init.d/snapd start
|
- export DEBIAN_FRONTEND=noninteractive
|
||||||
- sudo snap install cqtdeployer
|
- apt install apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip -y
|
||||||
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
|
||||||
- sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
- apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic-rc main' -y
|
||||||
- sudo apt-get update -y
|
- apt update -y
|
||||||
- sudo apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
|
- apt install build-essential libgl1-mesa-dev lld ninja-build cmake -y
|
||||||
|
- pip3 install aqtinstall
|
||||||
|
- mkdir Qt
|
||||||
|
- aqt install --outputdir Qt/ 5.15.2 linux desktop
|
||||||
- cd Tools
|
- cd Tools
|
||||||
|
- wget https://github.com/QuasarApp/CQtDeployer/releases/download/1.5.2/CQtDeployer_1.5.2_OfflineInstaller_Linux64.run
|
||||||
- python setup.py
|
- python setup.py
|
||||||
- python build.py -t release
|
- python build.py -t release
|
||||||
artifacts:
|
artifacts:
|
||||||
|
Loading…
Reference in New Issue
Block a user