From ba5e19d34d1d131a7e5fc49f2d1fd7b7bad1f168 Mon Sep 17 00:00:00 2001 From: username223 Date: Sat, 2 Apr 2022 02:22:07 +0200 Subject: [PATCH] Revert "Add dedicated image for CircleCI builds" (#594) * Revert "Add dedicated image for CircleCI builds" This reverts commit 44a5d3eed056e8bfef83dedf05f0e3e680a1b2b9. With how little we use the Docker hub features it does not make sense to have external dependencies on it. * Add `qt512websockets` to CI build This is necessary for Ykeara's feature branch. --- .circleci/config.yml | 61 +++++++++++++++++++-- build_scripts/ci_images/DockerfileArtifacts | 52 ------------------ build_scripts/ci_images/README.md | 9 --- 3 files changed, 57 insertions(+), 65 deletions(-) delete mode 100644 build_scripts/ci_images/DockerfileArtifacts delete mode 100644 build_scripts/ci_images/README.md diff --git a/.circleci/config.yml b/.circleci/config.yml index 5cbc279..4a4b87c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,9 +13,65 @@ jobs: QT_SELECT: opt-qt512 MAKE_JOBS: 2 docker: - - image: username223/ovras-appimage-build + - 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 qt512websockets -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: | @@ -23,9 +79,6 @@ 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: - name: Run clang-format - command: python ./build_scripts/run-clang-format.py ./src -r --color always --clang-format-executable clang-format-8 - run: name: Update version number command: | diff --git a/build_scripts/ci_images/DockerfileArtifacts b/build_scripts/ci_images/DockerfileArtifacts deleted file mode 100644 index 7f3bbea..0000000 --- a/build_scripts/ci_images/DockerfileArtifacts +++ /dev/null @@ -1,52 +0,0 @@ -FROM circleci/buildpack-deps:xenial - -# Make sure all packages are up to date for the install -RUN sudo apt-get update && sudo apt-get upgrade - -# Required for LLVM -RUN sudo apt-get install software-properties-common apt-transport-https -y - -# Install LLVM7 and LLVM8 -RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - -RUN sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main' -RUN sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' -RUN sudo apt-get update -qq - -# Install LLVM8 binaries -# clang is reuired due to a check by qmake -# clang-tidy-8 has new errors compared to clang-tidy-7, so we haven't upgraded. -RUN sudo apt-get install clang-format-8 -y -RUN sudo apt-get install clang-tidy-7 -y -RUN sudo apt-get install clang-8 -y -RUN sudo apt-get install clang -y - -# Install g++ -RUN sudo add-apt-repository ppa:ubuntu-toolchain-r/test -RUN sudo apt-get update -RUN sudo apt-get install g++-7 -y - -# Add Qt 5.12 repos -RUN sudo add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -y -RUN sudo apt-get update -qq - -# Get build-essential and libgl1-mesa-dev -RUN sudo apt-get install build-essential libgl1-mesa-dev -y - -# Install Qt packages -RUN sudo apt-get install qt512-meta-minimal qt512multimedia qt512declarative qt512quickcontrols2 qt512quickcontrols qt512tools qt512imageformats qt512svg qt512base qtchooser -y - -# Install X11 packages -RUN sudo apt-get install libx11-dev libxt-dev libxtst-dev -y - -# Install PulseAudio packages -RUN sudo apt-get install libpulse-dev -y - -# Install bear/clang-tidy -RUN sudo apt-get install bear clang-tidy -y - -# Install SDL libs -RUN sudo apt-get install libsdl2-2.0-0 -y - -# Set up qtchooser -RUN qtchooser -install opt-qt512 /opt/qt512/bin/qmake - diff --git a/build_scripts/ci_images/README.md b/build_scripts/ci_images/README.md deleted file mode 100644 index f5a1241..0000000 --- a/build_scripts/ci_images/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# CI Build Images for OVRAS - -Docker images for use on CI. - -Can be built with `sudo docker build -t [tagname] . -f DockerfileName`. - -Must be uploaded to DockerHub through `sudo docker push [tagname]` and then used in the CI file via the `image: ` command. - -