From 4beca6b9a5f8454173031f5b64a7fb30dafa8795 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Tue, 21 Nov 2023 18:07:12 -0600 Subject: [PATCH] Fix azure-pipelines git-lfs --- .azure-pipelines/shared/build_linux.yml | 2 + .azure-pipelines/shared/build_mingw.yml | 3 ++ .azure-pipelines/shared/build_msvc.yml | 3 ++ .../shared/check_clang_format.yml | 3 ++ .azure-pipelines/shared/check_file_format.yml | 41 ++++++++++--------- .azure-pipelines/shared/codespell.yml | 3 ++ 6 files changed, 36 insertions(+), 19 deletions(-) diff --git a/.azure-pipelines/shared/build_linux.yml b/.azure-pipelines/shared/build_linux.yml index 49854766..ae45f038 100644 --- a/.azure-pipelines/shared/build_linux.yml +++ b/.azure-pipelines/shared/build_linux.yml @@ -16,6 +16,8 @@ parameters: default: build steps: + - checkout: self + lfs: true - script: | rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }} mkdir -p ${{ parameters.sourceDir }}/${{ parameters.buildDir }} diff --git a/.azure-pipelines/shared/build_mingw.yml b/.azure-pipelines/shared/build_mingw.yml index 13c41b17..0d38848a 100644 --- a/.azure-pipelines/shared/build_mingw.yml +++ b/.azure-pipelines/shared/build_mingw.yml @@ -17,6 +17,9 @@ parameters: default: "true" steps: + - checkout: self + lfs: true + # - script: choco install -y ninja # displayName: 'Install Ninja' diff --git a/.azure-pipelines/shared/build_msvc.yml b/.azure-pipelines/shared/build_msvc.yml index 667c8b30..6285403a 100644 --- a/.azure-pipelines/shared/build_msvc.yml +++ b/.azure-pipelines/shared/build_msvc.yml @@ -20,6 +20,9 @@ parameters: default: "true" steps: + - checkout: self + lfs: true + - powershell: ./.azure-pipelines/shared/install_vulkan.ps1 displayName: Install Vulkan SDK workingDirectory: "${{ parameters.sourceDir }}" diff --git a/.azure-pipelines/shared/check_clang_format.yml b/.azure-pipelines/shared/check_clang_format.yml index d6d1cadb..0ad201be 100644 --- a/.azure-pipelines/shared/check_clang_format.yml +++ b/.azure-pipelines/shared/check_clang_format.yml @@ -9,6 +9,9 @@ jobs: container: khronosgroup/docker-images:openxr-sdk.20230323 # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032 steps: + - checkout: self + lfs: true + - script: ./runClangFormat.sh displayName: Run clang-format diff --git a/.azure-pipelines/shared/check_file_format.yml b/.azure-pipelines/shared/check_file_format.yml index 2c14cbc4..549d72e1 100644 --- a/.azure-pipelines/shared/check_file_format.yml +++ b/.azure-pipelines/shared/check_file_format.yml @@ -1,23 +1,26 @@ # Copyright (c) 2020-2023, The Khronos Group Inc. # SPDX-License-Identifier: Apache-2.0 jobs: -- job: check_file_format - displayName: 'Check file formatting' - pool: - vmImage: 'ubuntu-latest' - container: khronosgroup/docker-images:openxr-sdk.20230323 - # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032 - steps: - - script: ./file_format.sh - displayName: File formatting checks (file_format.sh) + - job: check_file_format + displayName: "Check file formatting" + pool: + vmImage: "ubuntu-latest" + container: khronosgroup/docker-images:openxr-sdk.20230323 + # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032 + steps: + - checkout: self + lfs: true - - script: git diff --patch --exit-code > file_format.patch - displayName: Save changes as diff - - script: echo "The following files need file formatting:"; sed -n -e "s/^diff.* b\///p" file_format.patch - condition: failed() - - task: PublishPipelineArtifact@1 - displayName: Publish diff - condition: failed() - inputs: - path: $(System.DefaultWorkingDirectory)/file_format.patch - artifact: file_format_changes + - script: ./file_format.sh + displayName: File formatting checks (file_format.sh) + + - script: git diff --patch --exit-code > file_format.patch + displayName: Save changes as diff + - script: echo "The following files need file formatting:"; sed -n -e "s/^diff.* b\///p" file_format.patch + condition: failed() + - task: PublishPipelineArtifact@1 + displayName: Publish diff + condition: failed() + inputs: + path: $(System.DefaultWorkingDirectory)/file_format.patch + artifact: file_format_changes diff --git a/.azure-pipelines/shared/codespell.yml b/.azure-pipelines/shared/codespell.yml index d582e521..17f98714 100644 --- a/.azure-pipelines/shared/codespell.yml +++ b/.azure-pipelines/shared/codespell.yml @@ -9,5 +9,8 @@ jobs: container: khronosgroup/docker-images:openxr-sdk.20230323 # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032 steps: + - checkout: self + lfs: true + - script: ./checkCodespell displayName: Run Codespell script