Skip to content

Commit b326acf

Browse files
authored
Merge branch 'anyaevostinar:main' into jump-fix
2 parents 9a2a80e + b34220c commit b326acf

11 files changed

Lines changed: 6491 additions & 9 deletions

File tree

.github/workflows/CI.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232

3333
- name: Upload coverage
3434
uses: codecov/codecov-action@v5
35+
with:
36+
exclude: source/catch,source/json,source/test
3537
env:
3638
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
3739

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Data/
2+
_test/
3+
14
.DS_Store
25
StatsConfig.cfg
36
SymSettings.cfg

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
TEST_DIR := source/catch
33
EMP_DIR := Empirical/include
44
SGP_DIR := signalgp-lite/include
5+
CEREAL_DIR := signalgp-lite/third-party/cereal/include
56
TAG_NUM_BITS = 32
67

78
# Flags to use regardless of compiler
89
VENDORIZE_EMP_FLAGS := -DUIT_VENDORIZE_EMP -DUIT_SUPPRESS_MACRO_INSEEP_WARNINGS
910
COMPILE_TIME_ARGS := -DTAG_NUM_BITS=$(TAG_NUM_BITS)
10-
CFLAGS_all := -Wall -Wno-unused-function -std=c++20 $(COMPILE_TIME_ARGS) -I$(EMP_DIR)/ -I$(SGP_DIR)/ ${VENDORIZE_EMP_FLAGS}
11+
CFLAGS_all := -Wall -Wno-unused-function -std=c++20 $(COMPILE_TIME_ARGS) -I$(EMP_DIR)/ -I$(SGP_DIR)/ -I$(CEREAL_DIR)/ ${VENDORIZE_EMP_FLAGS}
1112

1213
# Native compiler information
1314
CXX_nat := g++

codecov.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
ignore:
2-
- "source/catch/**/*"
2+
- "**/source/catch/**"
3+
- "**/source/json/**"
34
- "stats_scripts/**/*"
45
- "web/**/*"
56
- "source/Organism.h"
67
- "source/*.test.cc"
78
- "Empirical/**/*"
89
- "coverage_source/**/*"
9-
- "source/test/**/*"
10+
- "**/source/test/**"
1011
- "signalgp-lite/**/*"

0 commit comments

Comments
 (0)