Clean up CircleCI config
This commit is contained in:
+10
-5
@@ -83,12 +83,12 @@ jobs:
|
|||||||
- checkout
|
- checkout
|
||||||
- run: sudo apt-get update && sudo apt-get upgrade -y
|
- run: sudo apt-get update && sudo apt-get upgrade -y
|
||||||
- run:
|
- run:
|
||||||
name: Get wget and apt-key
|
name: Get apt-key
|
||||||
|
# Required for LLVM
|
||||||
command: |
|
command: |
|
||||||
sudo apt-get install wget -y
|
|
||||||
sudo apt-get install software-properties-common -y
|
sudo apt-get install software-properties-common -y
|
||||||
- run:
|
- run:
|
||||||
name: Set up LLVM-8 repo
|
name: Get LLVM repos
|
||||||
command: |
|
command: |
|
||||||
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
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-8 main'
|
||||||
@@ -96,6 +96,8 @@ jobs:
|
|||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
- run:
|
- run:
|
||||||
name: Install LLVM-8 binaries
|
name: Install LLVM-8 binaries
|
||||||
|
# clang is required due to a check by Qmake.
|
||||||
|
# clang-tidy-8 has new errors compared to clang-tidy-7, so we haven't upgraded.
|
||||||
command: |
|
command: |
|
||||||
sudo apt-get install clang-format-8 -y
|
sudo apt-get install clang-format-8 -y
|
||||||
sudo apt-get install clang-tidy-7 -y
|
sudo apt-get install clang-tidy-7 -y
|
||||||
@@ -120,7 +122,6 @@ jobs:
|
|||||||
name: Install QT packages
|
name: Install QT packages
|
||||||
command: |
|
command: |
|
||||||
sudo 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:
|
- run:
|
||||||
name: Install X11 packages
|
name: Install X11 packages
|
||||||
command: sudo apt-get install libx11-dev libxt-dev libxtst-dev -y
|
command: sudo apt-get install libx11-dev libxt-dev libxtst-dev -y
|
||||||
@@ -137,7 +138,11 @@ jobs:
|
|||||||
chmod +x ./build_scripts/linux/format.sh
|
chmod +x ./build_scripts/linux/format.sh
|
||||||
chmod +x ./build_scripts/linux/run-clang-tidy.sh
|
chmod +x ./build_scripts/linux/run-clang-tidy.sh
|
||||||
chmod +x ./build_scripts/linux/verify_formatting.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:
|
||||||
|
name: Update version number
|
||||||
|
command: |
|
||||||
|
python ./build_scripts/append_to_version_file.py $(git rev-parse HEAD | cut -c -8)
|
||||||
|
cat ./build_scripts/compile_version_string.txt
|
||||||
- run:
|
- run:
|
||||||
name: Run build script
|
name: Run build script
|
||||||
command: ./build_scripts/linux/build_linux.sh
|
command: ./build_scripts/linux/build_linux.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user