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

GitHub Actions - git lfs fix #69

Merged
merged 5 commits into from
Nov 22, 2023
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
5 changes: 3 additions & 2 deletions .azure-pipelines/shared/build_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ jobs:
presentationBackend: wayland
pool:
vmImage: "ubuntu-latest"
container: khronosgroup/docker-images:openxr-sdk.20230323
# container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
# 20230614
container: khronosgroup/docker-images:openxr-sdk@sha256:fbc5fe29a0787cccc8f66bd9bd03c9dbddf591c7d1aea673108c38c908b280f5

steps:
# First build as debug
- template: build_linux.yml
Expand Down
16 changes: 8 additions & 8 deletions .azure-pipelines/shared/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ parameters:
default: build

steps:
- script: |
rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
mkdir -p ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
displayName: "Clean up and create new build directory"
- checkout: self
lfs: true
- script: "rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }}"
displayName: "Clean up build directory"

- script: cmake -G Ninja .. -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}
workingDirectory: ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
- script: "cmake -G Ninja -S . -B ${{ parameters.buildDir }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}"
workingDirectory: "${{ parameters.sourceDir }}"
displayName: "Generate build system"

- script: ninja
workingDirectory: ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
- script: "ninja -C ${{ parameters.buildDir }}"
workingDirectory: "${{ parameters.sourceDir }}"
displayName: "Compile"
3 changes: 3 additions & 0 deletions .azure-pipelines/shared/build_mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ parameters:
default: "true"

steps:
- checkout: self
lfs: true

# - script: choco install -y ninja
# displayName: 'Install Ninja'

Expand Down
3 changes: 3 additions & 0 deletions .azure-pipelines/shared/build_msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
8 changes: 6 additions & 2 deletions .azure-pipelines/shared/check_clang_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ jobs:
displayName: "clang-format"
pool:
vmImage: "ubuntu-latest"
container: khronosgroup/docker-images:openxr-sdk.20230323
# container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
# 20230614
container: khronosgroup/docker-images:openxr-sdk@sha256:fbc5fe29a0787cccc8f66bd9bd03c9dbddf591c7d1aea673108c38c908b280f5

steps:
- checkout: self
lfs: true

- script: ./runClangFormat.sh
displayName: Run clang-format

Expand Down
39 changes: 20 additions & 19 deletions .azure-pipelines/shared/check_file_format.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# 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"
# 20230614
container: khronosgroup/docker-images:openxr-sdk@sha256:fbc5fe29a0787cccc8f66bd9bd03c9dbddf591c7d1aea673108c38c908b280f5

- 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
steps:
- 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
8 changes: 6 additions & 2 deletions .azure-pipelines/shared/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ jobs:
displayName: "codespell"
pool:
vmImage: "ubuntu-latest"
container: khronosgroup/docker-images:openxr-sdk.20230323
# container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
# 20230614
container: khronosgroup/docker-images:openxr-sdk@sha256:fbc5fe29a0787cccc8f66bd9bd03c9dbddf591c7d1aea673108c38c908b280f5

steps:
- checkout: self
lfs: true

- script: ./checkCodespell
displayName: Run Codespell script
6 changes: 4 additions & 2 deletions .github/workflows/android-cts-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2022, Collabora, Ltd.
# Copyright 2021-2023, Collabora, Ltd.
# SPDX-License-Identifier: CC0-1.0

name: Android OpenXR-CTS - Android Build
Expand All @@ -20,6 +20,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: true

- name: Get modern CMake and Ninja
uses: lukka/[email protected]
Expand All @@ -31,7 +33,7 @@ jobs:
distribution: "temurin"
cache: gradle

- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v2.9.0
with:
arguments: ${{ inputs.gradleTask }}
build-root-directory: src/conformance
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/android-cts-pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2022, Collabora, Ltd.
# Copyright 2021-2023, Collabora, Ltd.
# SPDX-License-Identifier: CC0-1.0

name: Android OpenXR-CTS
Expand All @@ -15,6 +15,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: true

- name: Get modern CMake and Ninja
uses: lukka/[email protected]
Expand All @@ -26,7 +28,7 @@ jobs:
distribution: "temurin"
cache: gradle

- uses: gradle/gradle-build-action@v2
- uses: gradle/gradle-build-action@v2.9.0
with:
arguments: assembleDebug
build-root-directory: src/conformance
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-cts-release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2022, Collabora, Ltd.
# Copyright 2021-2023, Collabora, Ltd.
# SPDX-License-Identifier: CC0-1.0

name: Android OpenXR-CTS - Release
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/check_clang_format_and_codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ jobs:
clang-format:
runs-on: ubuntu-latest
container:
image: khronosgroup/docker-images:openxr-sdk.20230209
# 20230614
image: khronosgroup/docker-images:openxr-sdk@sha256:fbc5fe29a0787cccc8f66bd9bd03c9dbddf591c7d1aea673108c38c908b280f5

steps:
- uses: actions/checkout@v4
with:
lfs: true

- run: ./runClangFormat.sh
name: Run clang-format

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022, Collabora, Ltd.
# Copyright 2022-2023, Collabora, Ltd.
# SPDX-License-Identifier: CC0-1.0

name: Validate Gradle Wrapper
Expand All @@ -16,4 +16,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
lfs: true
- uses: gradle/wrapper-validation-action@v1
2 changes: 2 additions & 0 deletions .github/workflows/msvc-build-preset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
INSTALL_DIR: "${{ github.workspace }}/install"
steps:
- uses: actions/checkout@v4
with:
lfs: true

- name: Get modern CMake and Ninja
uses: lukka/[email protected]
Expand Down
Loading