diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 19d53df04..080186e8e 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -294,6 +294,7 @@ "xbox", "Xclang", "xcode", + "xcodebuild", "XSMB", "zulu" ], diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index 2e61f3d27..1629c13c9 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -127,6 +127,14 @@ jobs: ) displayName: Set Xcode version + - pwsh: /usr/bin/xcodebuild -version + condition: >- + and( + succeeded(), + eq(variables['Agent.OS'], 'Darwin') + ) + displayName: Xcode version + - template: /eng/pipelines/templates/steps/vcpkg.yml # Validate all the files are formatted correctly according to the diff --git a/eng/pipelines/templates/steps/cmake-build.yml b/eng/pipelines/templates/steps/cmake-build.yml index d0add2c53..66fc81446 100644 --- a/eng/pipelines/templates/steps/cmake-build.yml +++ b/eng/pipelines/templates/steps/cmake-build.yml @@ -15,6 +15,10 @@ steps: workingDirectory: build displayName: cmake --version + - script: clang --version + workingDirectory: build + displayName: clang --version + - script: | ${{ parameters.Env }} cmake ${{ parameters.VcpkgArgs }} ${{ parameters.GenerateArgs }} .. workingDirectory: build diff --git a/eng/pipelines/templates/steps/vcpkg.yml b/eng/pipelines/templates/steps/vcpkg.yml index 01b702882..ddb66977e 100644 --- a/eng/pipelines/templates/steps/vcpkg.yml +++ b/eng/pipelines/templates/steps/vcpkg.yml @@ -3,6 +3,14 @@ steps: Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://cppvcpkgcache.blob.core.windows.net/public-vcpkg-container,,read" Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://cppvcpkgcache.blob.core.windows.net/public-vcpkg-container,,read" displayName: Set Vcpkg Variables + + - script: vcpkg --version + condition: >- + and( + succeeded(), + not(eq(variables['Agent.OS'], 'Darwin')) + ) + displayName: vcpkg --version - ${{if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: - task: AzurePowerShell@5