Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Add support for macOS-14 builds #375

Merged
merged 4 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions CI/macOS/install_deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

set -ex

LIBIIO_VERSION=libiio-v0
GLOG_VERSION=v0.4.0

WORKDIR=$(pwd)

install_packages() {
Expand Down Expand Up @@ -74,6 +71,18 @@ build_libiio() {
chmod +x macos_tar_fixup.sh
./macos_tar_fixup.sh
cd "${WORKDIR}"

echo "#### Building with documentation"
cd "${WORKDIR}"/libiio/build
cmake "${WORKDIR}"/libiio \
-Werror=dev \
-DCOMPILE_WARNING_AS_ERROR=ON \
-DCPP_BINDINGS=ON \
-DPYTHON_BINDINGS=ON \
-DWITH_DOC=ON \
-DWITH_SERIAL_BACKEND=ON
make
cd "${WORKDIR}"
}

install_packages
Expand Down
1 change: 0 additions & 1 deletion CI/ubuntu/install_deps
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh -e

TOP_DIR=$(pwd)
LIBIIO_VERSION=libiio-v0

set -x

Expand Down
17 changes: 6 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ variables:
REPO_SLUG: $(Build.Repository.Name)
CURRENT_COMMIT: $(Build.SourceVersion)
LIBIIO_VERSION: 'libiio-v0'
GLOG_VERSION: 'v0.4.0'

trigger:
- main
Expand All @@ -31,7 +32,7 @@ parameters:
- 3.9
- 3.8
- 3.7
# TODO: Fix conditions to export artifacts after validating current pipelines

jobs:
- job: LinuxBuilds
strategy:
Expand Down Expand Up @@ -75,7 +76,6 @@ jobs:
contents: '$(Agent.BuildDirectory)/s/build/?(libm2k*.deb|libm2k*.rpm)'
targetFolder: '$(Build.ArtifactStagingDirectory)'
- task: PublishPipelineArtifact@1
# condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), ne(variables['System.JobName'], 'deploy_doxygen'))
condition: and(succeeded(), ne(variables['System.JobName'], 'deploy_doxygen'))
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)'
Expand All @@ -89,13 +89,15 @@ jobs:
macOS_12:
poolName: 'Azure Pipelines'
vmImage: 'macOS-12'
agentName: 'Azure Pipelines 3'
artifactName: 'macOS-12'
macOS_13_x64:
poolName: 'Azure Pipelines'
vmImage: 'macOS-13'
agentName: 'Azure Pipelines 2'
artifactName: 'macOS-13-x64'
macOS_14_x64:
poolName: 'Azure Pipelines'
vmImage: 'macOS-14'
artifactName: 'macOS-14-x64'
# TODO: discuss with DevOps team how to setup ARM agent
# macOS_13_arm64:
# poolName: 'Default'
Expand All @@ -105,8 +107,6 @@ jobs:
pool:
name: $(poolName)
vmImage: $(vmImage)
demands:
- agent.name -equals $(agentName)
steps:
- checkout: self
fetchDepth: 1
Expand All @@ -117,7 +117,6 @@ jobs:
addToPath: true
- script: ./CI/macOS/install_deps
displayName: "Install Dependencies"
condition: ne(variables['agentName'],'macOS_arm64')
- task: CopyFiles@2
inputs:
sourceFolder: '$(Agent.BuildDirectory)/s/libiio/build/'
Expand Down Expand Up @@ -161,7 +160,6 @@ jobs:
contents: '$(Agent.BuildDirectory)/s/build_tar/?(*.tar.gz)'
targetFolder: '$(Build.ArtifactStagingDirectory)'
- task: PublishPipelineArtifact@1
# condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
condition: succeeded()
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)'
Expand Down Expand Up @@ -236,13 +234,11 @@ jobs:
displayName: Wheel Python ${{ pyVersion }}
- task: PowerShell@2
displayName: 'Create libm2k-system-setup installer'
# condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.JobName'], 'VS_2022'))
condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
inputs:
targetType: 'filePath'
filePath: ./CI/windows/create_installer.ps1
- task: PublishPipelineArtifact@1
# condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.JobName'], 'VS_2022'))
condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)/installer'
Expand All @@ -253,7 +249,6 @@ jobs:
targetType: 'filePath'
filePath: ./CI/windows/create_zips.ps1
- task: PublishPipelineArtifact@1
# condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
condition: succeeded()
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)/libm2k-$(PLATFORM)'
Expand Down
Loading