CI/azure/darwin: use gcc

install and use gcc when compiling osc on macOS Signed-off-by: Cristina Suteu <cristina.suteu@analog.com>
analogdevicesinc · Aug 16, 2023 · 2a718a9 · 2a718a9
1 parent c5996ac
commit 2a718a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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)'