From 0eb5c0a6db517a552a4b78e333b9b441532b3904 Mon Sep 17 00:00:00 2001 From: Cristina Suteu Date: Tue, 25 Apr 2023 14:11:35 +0300 Subject: [PATCH] CI/azure/darwin: use gcc install and use gcc when compiling osc on macOS Signed-off-by: Cristina Suteu (cherry picked from commit dfd75d7c71fa709516954b96805626c2f2652fdf) --- CI/azure/build_osc_darwin.sh | 4 +++- azure-pipelines.yml | 12 ++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/CI/azure/build_osc_darwin.sh b/CI/azure/build_osc_darwin.sh index 7d941249..d0b7193a 100755 --- a/CI/azure/build_osc_darwin.sh +++ b/CI/azure/build_osc_darwin.sh @@ -4,6 +4,7 @@ set -xe install_deps() { export APT_PKGS="cmake \ + gcc \ fftw \ libmatio \ libxml2 \ @@ -33,6 +34,7 @@ install_deps() { } brew_install_if_not_exists $APT_PKGS + brew cleanup } install_adi_pkgs() { @@ -43,7 +45,7 @@ install_adi_pkgs() { build_osc() { mkdir -p build && cd build - cmake ../ + cmake -DCMAKE_C_COMPILER="/usr/bin/gcc" ../ make -j9 } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 90cf49b4..51a7cb9f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -163,17 +163,9 @@ stages: displayName: "Setup" - script: | set -e - sudo docker run --name iio-oscilloscope --platform "linux/$(arch)" -e ARTIFACTNAME=$(artifactName) -v "$(Agent.BuildDirectory)/s":"/ci" -v "/usr/bin/qemu-$(arch)-static":"/usr/bin/qemu-$(arch)-static" "$(image)" /bin/bash -c "cd /ci/ && chmod +x ./CI/azure/build_osc_arm.sh && ./CI/azure/build_osc_arm.sh install_apt_pkgs && ./CI/azure/build_osc_arm.sh install_gtkdatabox && ./CI/azure/build_osc_arm.sh install_adi_debs" + sudo docker run -m=4g --name iio-oscilloscope --platform "linux/$(arch)" -e ARTIFACTNAME=$(artifactName) -v "$(Agent.BuildDirectory)/s":"/ci" -v "/usr/bin/qemu-$(arch)-static":"/usr/bin/qemu-$(arch)-static" "$(image)" /bin/bash -c "cd /ci/ && chmod +x ./CI/azure/build_osc_arm.sh && ./CI/azure/build_osc_arm.sh install_apt_pkgs && ./CI/azure/build_osc_arm.sh install_gtkdatabox && ./CI/azure/build_osc_arm.sh install_adi_debs && ./CI/azure/build_osc_arm.sh build_osc" sudo docker ps -a - displayName: "Install dependencies" - - script: | - set -e - sudo docker ps -a - sudo docker start iio-oscilloscope - sudo docker stop iio-oscilloscope - sudo docker ps -a - sudo docker run --name iio-oscilloscope "$(image)" /bin/bash -c "cd /ci/ && ./CI/azure/build_osc_arm.sh build_osc" - displayName: "Build" + displayName: "Install dependencies + build" - task: PublishPipelineArtifact@1 inputs: targetPath: '$(Build.ArtifactStagingDirectory)'