Add versioning to Linux artifacts and change CI image

The circleci/buildpack-deps:xenial contains python, which is needed for
the version changing script.
This commit is contained in:
Vasily
2019-07-04 16:44:31 +02:00
committed by username223
parent 329b4e7331
commit 8df1eb6f19
+23 -23
View File
@@ -73,62 +73,61 @@ update_and_install_prereqs: &update_and_install_prereqs
command: ./build_scripts/linux/build_linux.sh
jobs:
gcc:
environment:
QMAKE_SPEC: linux-g++
QT_SELECT: opt-qt512
MAKE_JOBS: 2
docker:
- image: "ubuntu:xenial"
- image: circleci/buildpack-deps:xenial
steps:
- checkout
- run: apt-get update && apt-get upgrade -y
- run: sudo apt-get update && sudo apt-get upgrade -y
- run:
name: Get wget and apt-key
command: |
apt-get install wget -y
apt-get install software-properties-common -y
sudo apt-get install wget -y
sudo apt-get install software-properties-common -y
- run:
name: Set up LLVM-8 repo
command: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
apt update -qq
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
sudo apt-get update -qq
- run:
name: Install LLVM-8 binaries
command: |
apt install clang-format-8 -y
apt install clang-tidy-7 -y
apt install clang-8 -y
apt install clang -y
sudo apt-get install clang-format-8 -y
sudo apt-get install clang-tidy-7 -y
sudo apt-get install clang-8 -y
sudo apt-get install clang -y
- run:
name: Run clang-format
command: python ./build_scripts/run-clang-format.py ./src -r --color always --clang-format-executable clang-format-8
- run:
name: Install g++-7
command: |
add-apt-repository ppa:ubuntu-toolchain-r/test
apt update
apt install g++-7 -y
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install g++-7 -y
- run:
name: Add required QT repos
command: |
add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -y
apt-get update -qq
- run: apt-get install build-essential libgl1-mesa-dev -y
sudo add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -y
sudo apt-get update -qq
- run: sudo apt-get install build-essential libgl1-mesa-dev -y
- run:
name: Install QT packages
command: |
apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base qtchooser -y
sudo apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base qtchooser -y
- run: ls -R /opt/qt512
- run:
name: Install X11 packages
command: apt-get install libx11-dev libxt-dev libxtst-dev -y
command: sudo apt-get install libx11-dev libxt-dev libxtst-dev -y
- run:
name: Install bear/clang-tidy
command: apt-get install bear clang-tidy -y
command: sudo apt-get install bear clang-tidy -y
- run:
name: Set up qtchooser
command: qtchooser -install opt-qt512 /opt/qt512/bin/qmake
@@ -139,6 +138,7 @@ jobs:
chmod +x ./build_scripts/linux/format.sh
chmod +x ./build_scripts/linux/run-clang-tidy.sh
chmod +x ./build_scripts/linux/verify_formatting.sh
- run: python ./build_scripts/append_to_version_file.py $(git rev-parse HEAD | cut -c -8)
- run: clang --version
- run:
name: Run build script
@@ -155,7 +155,7 @@ jobs:
name: Copy Artifacts
command: |
mkdir artifacts
cp ./OpenVR_Advanced_Settings-*.AppImage ./artifacts/
cp -v ./OpenVR_Advanced_Settings-*.AppImage ./artifacts/
- store_artifacts:
path: ./artifacts/