Skip to content

Commit

Permalink
Merge branch 'main' into fix/nullptr-on-serialization-error
Browse files Browse the repository at this point in the history
  • Loading branch information
Jerry-Jinfeng-Guo authored Jun 7, 2024
2 parents cef65cf + 585d5bb commit ef9e1a6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 38 deletions.
33 changes: 0 additions & 33 deletions .github/workflows/dco-check.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/main.yml
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
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

repos:
- repo: https://github.com/fsfe/reuse-tool
rev: v3.0.1
rev: v3.0.2
hooks:
- id: reuse
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 22.6.0
rev: 24.4.2
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.2.0
rev: v1.10.0
hooks:
- id: mypy
- repo: local
Expand Down

0 comments on commit ef9e1a6

Please sign in to comment.