Merge branch 'main' into timestamps

man-group · May 17, 2024 · 3154eac · 3154eac
2 parents 62a5da0 + 5503960
commit 3154eac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -18,9 +18,9 @@ jobs:
  fail-fast: false
  matrix:
  sys:
- - {compiler: clang, version: '16', config-flags: '', stdlib: 'libstdc++-13' }
+ - {compiler: clang, version: '16', config-flags: '', stdlib: 'libstdc++-12' }
  # - {compiler: clang, version: '16', config-flags: '-DCMAKE_CXX_FLAGS=-stdlib=libc++', stdlib: 'libc++-17' }
- - {compiler: clang, version: '17', config-flags: '', stdlib: 'libstdc++-13' }
+ - {compiler: clang, version: '17', config-flags: '', stdlib: 'libstdc++-12' }
  # - {compiler: clang, version: '17', config-flags: '-DCMAKE_CXX_FLAGS=-stdlib=libc++', stdlib: 'libc++-17' }
  - {compiler: gcc, version: '12', config-flags: '' }
  - {compiler: gcc, version: '13', config-flags: '' }

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -24,7 +24,7 @@ jobs:
  - { name: Debug }
  - { name: Release }
  compiler:
- - clang
+ # - clang # TODO: Uncomment this line when we have fixed the compilation issue
  - apple-clang
 
  steps: