Skip to content

Revert "temporarily add DCO check" #632

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jun 7, 2024
Merged

Revert "temporarily add DCO check" #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dc50d3a
Revert "temporarily add DCO check"
mgovers Jun 6, 2024
6abd26b
re-add clang cl
mgovers Jun 6, 2024
84042e0
improve
mgovers Jun 6, 2024
d568242
test without clang-cl override
mgovers Jun 6, 2024
b66f2b2
Merge branch 'main' into revert-625-feature/temporary-dco-check
mgovers Jun 6, 2024
0e05c7d
Revert "test without clang-cl override"
mgovers Jun 7, 2024
6b12497
always use VS llvm version and not system llvm version
mgovers Jun 7, 2024
b089421
always use VS llvm version and not system llvm version
mgovers Jun 7, 2024
9bb4d3a
Merge branch 'revert-625-feature/temporary-dco-check' into feature/te…
mgovers Jun 7, 2024
c103e9d
Merge pull request #633 from PowerGridModel/feature/test-clang-cl
mgovers Jun 7, 2024
0624e74
Merge branch 'main' into revert-625-feature/temporary-dco-check
mgovers Jun 7, 2024
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
33 changes: 0 additions & 33 deletions .github/workflows/dco-check.yml
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
strategy:
matrix:
build-option: [ debug, release ]
compiler: [msvc] # , clang-cl] TODO(mgovers): reenable Clang CL when https://github.com/actions/runner-images/issues/10001 is fixed
compiler: [msvc, clang-cl]

env:
PRESET: ${{ matrix.compiler }}-${{ matrix.build-option }}
Expand Down Expand Up @@ -127,6 +127,10 @@ jobs:
Import-Module (Join-Path $vsPath 'Common7\Tools\Microsoft.VisualStudio.DevShell.dll')
Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -host_arch=x64'

# Resolve dirty PATH environment
# TODO(mgovers): Remove after https://github.com/actions/runner-images/issues/10001 is resolved
$env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'

# generate cmake cache
cmake --preset ${{ env.PRESET }} -DCMAKE_PREFIX_PATH=C:\conda_envs\cpp_pkgs\Library; if(!$?) { Exit $LASTEXITCODE }
# build
Expand Down