Skip to content

Commit 2ed50ff

Browse files
committed
Enable CI on rewrite branch using new 'ci' target
ChangeLog: * .github/workflows/Clang.yml: Add rewrite branch. Use 21 and 22. Pull from latest cplusplus-ci/clang. Build ci target. * .github/workflows/GCC.yml: Likewise, except for gcc16 only. * Makefile.common: Build with -D_GLIBCXX_SIMD_CONSTEVAL_BROADCAST. Filter out misc test (for now). * Makefile.more: Add ci target. * Makefile: Add ci to more_checks.
1 parent 90ee45b commit 2ed50ff

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

.github/workflows/Clang.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ name: Clang
66

77
on:
88
push:
9-
branches: [ main ]
9+
branches: [ main, rewrite ]
1010
pull_request:
1111

1212
jobs:
1313
clang:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
version: [20, 21]
17+
version: [21, 22]
1818

1919
runs-on: ubuntu-latest
2020

2121
container:
22-
image: ghcr.io/mattkretz/cplusplus-ci/base
22+
image: ghcr.io/mattkretz/cplusplus-ci/clang${{ matrix.version }}
2323

2424
steps:
2525
- uses: actions/checkout@v4
2626

2727
- name: Run test suite
2828
env:
29-
CXX: clang++-${{ matrix.version }}
30-
run: make -j2 check-constexpr check/arithmetic.skylake/float.41
29+
CXX: clang++
30+
run: make -j2 ci

.github/workflows/GCC.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ name: GCC
66

77
on:
88
push:
9-
branches: [ main ]
9+
branches: [ main, rewrite ]
1010
pull_request:
1111

1212
jobs:
1313
gcc:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
version: [14, 15, master]
17+
version: [16]
1818

1919
runs-on: ubuntu-latest
2020

2121
container:
22-
image: ghcr.io/mattkretz/cplusplus-ci/latest
22+
image: ghcr.io/mattkretz/cplusplus-ci/gcc${{ matrix.version }}
2323

2424
steps:
2525
- uses: actions/checkout@v4
2626

2727
- name: Run test suite
2828
env:
29-
CXX: g++-${{ matrix.version }}
30-
run: make -j2 check-constexpr check/simd_bit.ivybridge/unsigned-short.39 check/simd_alg.core2/signed-int.9 check/arithmetic.skylake/float.41
29+
CXX: g++
30+
run: make -j2 ci

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ debug:
9898
@echo "prefix: $(prefix)"
9999
@$(MAKE) -f Makefile.more $@
100100

101-
more_checks := check check10 check1 check-failed check-passed check-untested check-fast-math rerun
101+
more_checks := ci check check10 check1 check-failed check-passed check-untested check-fast-math rerun
102102

103103
.PHONY: $(more_checks)
104104
$(more_checks): $(check_targets)

Makefile.common

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
objdir = obj
66

7-
CXXFLAGS+=-std=c++26 -Wall -Wextra -Werror -O2 -g0 -Wno-attributes -D_GLIBCXX_ASSERTIONS=1 $(FLAGS)
7+
CXXFLAGS+=-std=c++26 -Wall -Wextra -Werror -O2 -g0 -Wno-attributes -D_GLIBCXX_ASSERTIONS=1 -D_GLIBCXX_SIMD_CONSTEVAL_BROADCAST $(FLAGS)
88
CXXFLAGS_clang := -Wno-unknown-pragmas -ferror-limit=3
9-
CXXFLAGS_gcc := -fconcepts-diagnostics-depth=3 -fconstexpr-ops-limit=67108864 -fmax-errors=1
9+
CXXFLAGS_gcc := -fconcepts-diagnostics-depth=2 -fconstexpr-ops-limit=67108864 -fmax-errors=2 -Wno-psabi
1010

1111
cxx_version := $(shell $(CXX) --version | head -n1)
1212

@@ -87,7 +87,9 @@ testarchs ::= x86-64 \
8787
x86-64-v4 \
8888
graniterapids
8989

90-
tests ::= $(patsubst tests/%.cpp,%,$(wildcard tests/*.cpp))
90+
disabled_tests ::= misc
91+
92+
tests ::= $(filter-out $(disabled_tests),$(patsubst tests/%.cpp,%,$(wildcard tests/*.cpp)))
9193

9294
testtypes ::= signed-char \
9395
unsigned-char \

Makefile.more

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ endif
4040
.PHONY: check check10 check1
4141
check: check-constexpr $(shuffled_checks) $(codegen_targets)
4242

43+
ci: check-constexpr $(wordlist 1,40,$(shuffled_checks)) $(codegen_targets)
44+
4345
check1: check-constexpr $(wordlist 1,$(total1),$(shuffled_checks)) $(codegen_targets)
4446

4547
check10: check-constexpr $(wordlist 1,$(total10),$(shuffled_checks)) $(codegen_targets)

0 commit comments

Comments
 (0)