Skip to content

Commit 7992f03

Browse files
committed
add back clang, drop clan 10 test, add alorithm header for swap in vtr_vector.h
1 parent 55487b0 commit 7992f03

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/scripts/install_dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ sudo apt install -y \
4343
qtbase5-dev \
4444
uuid-dev \
4545
default-jdk \
46+
clang \
4647
clang-format-12 \
4748
g++-9 \
4849
gcc-9 \
4950
g++-10 \
5051
gcc-10 \
5152
g++-11 \
5253
gcc-11 \
53-
libopencl-clang10 \
5454
clang-12 \
5555
libtbb12
5656

.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -360,11 +360,10 @@ jobs:
360360
fail-fast: false
361361
matrix:
362362
include:
363-
- { name: 'GCC 9 (Ubuntu Focal - 20.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
364-
- { name: 'GCC 10 (Ubuntu Hirsute - 21.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
365-
- { name: 'GCC 11 (Latest)', eval: 'CC=gcc-11 && CXX=g++-11', }
366-
- { name: 'Clang 10 (Ubuntu Focal - 20.04)', eval: 'CC=clang-10 && CXX=clang++-10', }
367-
- { name: 'Clang 12 (Ubuntu Focal - 20.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
363+
- { name: 'GCC 9 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
364+
- { name: 'GCC 10 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
365+
- { name: 'GCC 11 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-11 && CXX=g++-11', }
366+
- { name: 'Clang 12 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
368367
name: 'B: ${{ matrix.name }}'
369368
steps:
370369

libs/libvtrutil/src/vtr_vector.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <vector>
44
#include <cstddef>
55
#include <iterator>
6+
#include <algorithm>
67
#include "vtr_range.h"
78

89
namespace vtr {

0 commit comments

Comments
 (0)