Skip to content

Commit

Permalink
Try again with env variable
Browse files Browse the repository at this point in the history
  • Loading branch information
dmachaj committed Dec 6, 2024
1 parent 90929d3 commit d21a51c
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
& "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
$originalWorkingDirectory = Get-Location
Set-Location ${{ github.env.GITHUB_WORKSPACE }}
$repoRoot = $GITHUB_WORKSPACE
Write-Host "The root of the repository is $repoRoot"
& .\find_clang_format.cmd
& $repoRoot\find_clang_format.cmd
if ($LASTEXITCODE -ne 0) {
exit $LASTEXITCODE
}
& git clang-format origin/master --binary "$env:CLANG_FORMAT" --style file -- cppwinrt/*.h cppwinrt/*.cpp fast_fwd/*.h fast_fwd/*.cpp prebuild/*.h prebuild/*.cpp scratch/*.h scratch/*.cpp strings/*.h strings/*.cpp test/*.h test/*.cpp vsix/*.h vsix/*.cpp
& git clang-format origin/master --binary "$env:CLANG_FORMAT" --style file -- $repoRoot/cppwinrt/*.h $repoRoot/cppwinrt/*.cpp $repoRoot/fast_fwd/*.h $repoRoot/fast_fwd/*.cpp $repoRoot/prebuild/*.h $repoRoot/prebuild/*.cpp $repoRoot/scratch/*.h $repoRoot/scratch/*.cpp $repoRoot/strings/*.h $repoRoot/strings/*.cpp $repoRoot/test/*.h $repoRoot/test/*.cpp $repoRoot/vsix/*.h $repoRoot/vsix/*.cpp
if ($LASTEXITCODE -ne 0) {
Write-Host ::error ERROR: This branch contains changes that have not been formatted with `'clang-format`'
Expand All @@ -46,8 +46,6 @@ jobs:
exit 1
}
Set-Location $originalWorkingDirectory
test-msvc-cppwinrt-build:
name: '${{ matrix.compiler }}: Build (${{ matrix.arch }}, ${{ matrix.config }})'
strategy:
Expand Down

0 comments on commit d21a51c

Please sign in to comment.