diff options
| author | Jelle Spijker <j.spijker@ultimaker.com> | 2022-04-14 21:41:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 21:41:09 +0300 |
| commit | 1a7667832f918781ca7d2e2e008f02708b6be07c (patch) | |
| tree | deb08d6fd74f2ac01be28fbced3935c8852aa3b8 | |
| parent | e63e8fd9830fa5b76c4f4baa8789ef52de3331dc (diff) | |
| parent | d52b9c4fe0888334252dc8cdcbb4d15208abf893 (diff) | |
Merge pull request #1641 from Ultimaker/5.0
5.0
| -rw-r--r-- | .github/workflows/cicd.yml | 23 | ||||
| -rw-r--r-- | conanfile.py | 1 | ||||
| -rwxr-xr-x | docker/build.sh | 24 |
3 files changed, 21 insertions, 27 deletions
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 3a0b57d71..e567a491b 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -4,10 +4,27 @@ on: [push, pull_request] jobs: build: name: Build and test - runs-on: ubuntu-latest - container: ultimaker/cura-build-environment + runs-on: ubuntu-20.04 + env: + CONAN_USER: ${{ secrets.CONAN_USER }} + CONAN_PASS: ${{ secrets.CONAN_PASS }} steps: - name: Checkout master uses: actions/checkout@v1.2.0 - name: Build and test - run: docker/build.sh + run: | + python -m pip install conan + conan profile new default --detect + conan config install https://github.com/ultimaker/conan-config.git + conan user -p $CONAN_PASS -r ultimaker $CONAN_USER + conan install . -if build -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing + + cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_TOOLCHAIN_FILE=build/conan_toolchain.cmake \ + -DBUILD_TESTS=OFF \ + .. + make -j $(nproc) + + conan upload "*" -r ultimaker --all -c
\ No newline at end of file diff --git a/conanfile.py b/conanfile.py index c24806e1c..201c2c6e4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -22,6 +22,7 @@ class CuraBuildEnvironemtConan(ConanFile): self.requires("gtest/1.8.1") self.requires("rapidjson/1.1.0") self.requires("stb/20200203") + self.requires("arcus/5.0.0-a+1@ultimaker/testing") def generate(self): cmake = CMakeDeps(self) diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index 534ec7383..000000000 --- a/docker/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Abort at the first error. -set -e - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )" - -# Make sure that environment variables are set properly -export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}" -export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}" -export LD_LIBRARY_PATH="${CURA_BUILD_ENV_PATH}/lib:${LD_LIBRARY_PATH}" - -cd "${PROJECT_DIR}" - -mkdir build -cd build -cmake \ - -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_PREFIX_PATH="${CURA_BUILD_ENV_PATH}" \ - -DBUILD_TESTS=ON \ - .. -make -ctest --output-on-failure -T Test |