aboutsummaryrefslogtreecommitdiffstats
path: root/.ci/docker
diff options
context:
space:
mode:
authorSteven Koo <steven.koo@ni.com>2021-03-16 12:39:29 -0500
committerAaron Rossetto <aaron.rossetto@ni.com>2021-03-19 15:40:09 -0500
commit3b29a89b9f9a8167a595eed2988b89e2a7f2112a (patch)
tree8606482f63f69d2aee7a926b5ffc540ffc13ec28 /.ci/docker
parent9aafc0ace2272746d708dcac6e5daaa50b7da4c7 (diff)
downloaduhd-3b29a89b9f9a8167a595eed2988b89e2a7f2112a.tar.gz
uhd-3b29a89b9f9a8167a595eed2988b89e2a7f2112a.tar.bz2
uhd-3b29a89b9f9a8167a595eed2988b89e2a7f2112a.zip
ci: Build uhd with Pipelines
This commit adds the infrastructure to build uhd on both Linux and Windows using Pipelines. Using the docker images generated by the build docker pipeline, this runs an AzDO container job to build uhd artifacts. It then stores the artifacts to be used in later pipelines or stages. This change supports make and ninja on Linux and msbuild with VS2017/VS2019 x86/x64 on Windows. Signed-off-by: Steven Koo <steven.koo@ni.com>
Diffstat (limited to '.ci/docker')
-rw-r--r--.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile9
-rw-r--r--.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile8
-rw-r--r--.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile9
-rw-r--r--.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile8
4 files changed, 24 insertions, 10 deletions
diff --git a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile
index d608ef4c4..12e198139 100644
--- a/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2017-v141-x64.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
# please follow docker best practices
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
@@ -36,7 +38,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
# This commit uses Boost 1.75 and libusb 1.0.24
git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
bootstrap-vcpkg.bat
+ # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
- libusb:x64-windows \
- boost:x64-windows
-
+ libusb:uhd-x64-windows-static-md \
+ boost:uhd-x64-windows-static-md
diff --git a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile
index f4cb509fe..6ef77132d 100644
--- a/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2017-v141-x86.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
# please follow docker best practices
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
@@ -36,6 +38,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
# This commit uses Boost 1.75 and libusb 1.0.24
git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
bootstrap-vcpkg.bat
+ # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
- libusb:x86-windows \
- boost:x86-windows
+ libusb:uhd-x86-windows-static-md \
+ boost:uhd-x86-windows-static-md
diff --git a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile
index eb8aedcf6..d10b87cac 100644
--- a/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2019-v142-x64.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
# please follow docker best practices
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
@@ -35,7 +37,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
# This commit uses Boost 1.75 and libusb 1.0.24
git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
bootstrap-vcpkg.bat
+ # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
- libusb:x64-windows \
- boost:x64-windows
-
+ libusb:uhd-x64-windows-static-md \
+ boost:uhd-x64-windows-static-md
diff --git a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile
index 92afa8214..87806af1e 100644
--- a/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile
+++ b/.ci/docker/uhd-builder-vs2019-v142-x86.Dockerfile
@@ -1,3 +1,5 @@
+# Docker build context must be uhd/uhddev root
+
# please follow docker best practices
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
@@ -35,6 +37,8 @@ RUN git clone https://github.com/microsoft/vcpkg %VCPKG_INSTALL_DIR% && \
# This commit uses Boost 1.75 and libusb 1.0.24
git checkout 3426db05b996481ca31e95fff3734cf23e0f51bc && \
bootstrap-vcpkg.bat
+ # Add custom UHD vcpkg triplet
+COPY host/cmake/vcpkg/* c:/vcpkg/triplets/
RUN cd %VCPKG_INSTALL_DIR% && vcpkg install --clean-after-build \
- libusb:x86-windows \
- boost:x86-windows
+ libusb:uhd-x86-windows-static-md \
+ boost:uhd-x86-windows-static-md