diff options
| author | Jelle Spijker <j.spijker@ultimaker.com> | 2022-04-14 21:05:12 +0300 |
|---|---|---|
| committer | Jelle Spijker <spijker.jelle@gmail.com> | 2022-04-14 21:05:12 +0300 |
| commit | 636b15338ae9dbe3c344ea7a26fbb948c0e06b08 (patch) | |
| tree | 8ddf84873afa22ef64e178e62c82f84d4ac12c95 | |
| parent | b000a1954b8be7c75b9a87bcedd1a2bcdce9186a (diff) | |
Upload build dependency to Ultimaker artifactory
Contributes to CURA-8640
| -rw-r--r-- | .github/workflows/cicd.yml | 20 | ||||
| -rwxr-xr-x | docker/build.sh | 27 |
2 files changed, 19 insertions, 28 deletions
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 7b04f72bc..b223dde7b 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -5,8 +5,26 @@ jobs: build: name: Build and test 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 --check
\ No newline at end of file diff --git a/docker/build.sh b/docker/build.sh deleted file mode 100755 index 8c32ee8de..000000000 --- a/docker/build.sh +++ /dev/null @@ -1,27 +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 )" - -cd "${PROJECT_DIR}" - -python -m pip install conan -conan profile new default --detect -conan config install https://github.com/ultimaker/conan-config.git -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) -#ctest --output-on-failure -T Test FIXME: use proper Conan targets for the GTest - -# TODO upload to conan server so build artifacts only need to be build once. But I would rather not do this to my private server -# We need to inject the cura user and password in this script then -# conan upload "*" -r ultimaker --all --check
\ No newline at end of file |