ykearaandVasily
a803ffaeac
* changed click noises to internal sounds * udpated to ovr 1.11.11 * in prog added prototypes * began wrapper for IVRSettings * added getters for chaperone colors * added setters for chaperone color * fixed type conversion issue * fixed linking issue, added additional settings chaperone page * adjusted chaperone page qml * added color chaperone UI * refactor in prog * updated ivrsettings wrapper, refactor in prog * refactor in prog * collision bound style add * refactor * cleaned up error logging * fixed fade distance remember bug * fixed sounds * fixed brightness opacity bug setting to 0 when 0 * fixed sounds * added wrapper for removing keys * refactored reset * added chaperone Styles to UI * added chaperone floor always on * fixed copy/paste error * adjsuted ui chaperone color slider * started adding chaperone floor marker * fixeed naming error overlay * finalized chaperone Ideas, added chaperone markers * began ivroverlay wrapper * center marker fully implemented * added function prototypes for new settings * added setting, and updated ui for New Center Marker Overlay * adjsuted sound effect volume and formatting for chaperonecolorbox * adjusted volume back * fixed various issues aroudn new overlay * removed artifact comment * cleaned up settings wrapper * cleaned up chaperone tab controller for namespace changes * removed ide comment issue * cleanup overlay wrapper * cleaned up tab/space changed file name * renamed files * fixed include statements * updated namespace in chaperonetabcontroller * fixed tab/space issues * re-activated boundbasisheight * fixed bulgarian case * changed chaperone warnings to only work in roomscale * fix capitilization * fixed tracking universe update * direct text input change for brightness * qml fixes * fixed qml format issues * fixed sound issue w/ sliders * fixed super truely * Add SDL libraries to CircleCI * Remove -tidy from circleCI config * flushed out error messages in overlaywrapper * removed hungarian notation * added get/set string to ovrsettings wrapper * misc cleanup * add reset orientation btn and new center marker to chaperone * ui adjustments * changed alarm audio * adjusted sound effect volume slightly lower * updated for 5.1.0 release Co-authored-by: Vasily <vautkin@teknik.io>
106 lines
4.6 KiB
YAML
106 lines
4.6 KiB
YAML
version: 2.0
|
|
|
|
jobs:
|
|
build:
|
|
branches:
|
|
ignore:
|
|
- /docs-*/
|
|
- /do-not-run-ci-*/
|
|
- /only-appveyor-ci-*/
|
|
- /only-travis-ci-*/
|
|
environment:
|
|
QMAKE_SPEC: linux-g++
|
|
QT_SELECT: opt-qt512
|
|
MAKE_JOBS: 2
|
|
docker:
|
|
- image: circleci/buildpack-deps:xenial
|
|
steps:
|
|
- checkout
|
|
- run: sudo apt-get update && sudo apt-get upgrade -y
|
|
- run:
|
|
name: Get apt-key
|
|
# Required for LLVM
|
|
command: |
|
|
sudo apt-get install software-properties-common apt-transport-https -y
|
|
- run:
|
|
name: Get LLVM repos
|
|
command: |
|
|
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
|
|
# 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: |
|
|
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++
|
|
command: |
|
|
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: |
|
|
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: |
|
|
sudo apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base qtchooser -y
|
|
- run:
|
|
name: Install X11 packages
|
|
command: sudo apt-get install libx11-dev libxt-dev libxtst-dev -y
|
|
- run:
|
|
name: Install pulse packages
|
|
command: sudo apt-get install libpulse-dev -y
|
|
- run:
|
|
name: Install bear/clang-tidy
|
|
command: sudo apt-get install bear clang-tidy -y
|
|
- run:
|
|
name: Install SDL libs
|
|
command: sudo apt-get install libsdl2-2.0-0 -y
|
|
- run:
|
|
name: Set up qtchooser
|
|
command: qtchooser -install opt-qt512 /opt/qt512/bin/qmake
|
|
- run:
|
|
name: Give build scripts +x
|
|
command: |
|
|
chmod +x ./build_scripts/linux/build_linux.sh
|
|
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:
|
|
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:
|
|
name: Run build script
|
|
command: ./build_scripts/linux/build_linux.sh
|
|
- run:
|
|
name: Get qtdeploylinux
|
|
command: |
|
|
wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
|
|
chmod a+x ./linuxdeployqt-continuous-x86_64.AppImage
|
|
- run:
|
|
name: Create AppImage
|
|
command: ./build_scripts/linux/appimage.sh
|
|
- run:
|
|
name: Copy Artifacts
|
|
command: |
|
|
mkdir artifacts
|
|
cp -v ./OpenVR_Advanced_Settings-*.AppImage ./artifacts/
|
|
- store_artifacts:
|
|
path: ./artifacts/
|
|
|