Skip to content

Commit 80cbb18

Browse files
author
Dylan Storey
committed
Fix CI for Linux and Windows
- Fix mktemp calls to use XXXXXX template (required on Linux) - Add mingw-w64-x86_64-libsystre for POSIX regex.h on Windows - Link -lsystre for regex functions on Windows - Run full performance test suite in CI
1 parent e7a2016 commit 80cbb18

6 files changed

Lines changed: 13 additions & 14 deletions

File tree

‎.github/workflows/ci-fast.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
install: >-
9898
mingw-w64-x86_64-gcc
9999
mingw-w64-x86_64-sqlite3
100+
mingw-w64-x86_64-libsystre
100101
bison
101102
flex
102103
make

‎.github/workflows/ci-full.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ jobs:
173173
install: >-
174174
mingw-w64-x86_64-gcc
175175
mingw-w64-x86_64-sqlite3
176+
mingw-w64-x86_64-libsystre
176177
bison
177178
flex
178179
make
@@ -197,8 +198,5 @@ jobs:
197198
- name: Build extension
198199
run: make extension
199200

200-
- name: Run quick performance tests
201-
run: make test-perf-quick
202-
203-
- name: Run performance summary
204-
run: make performance 100k
201+
- name: Run performance tests
202+
run: make performance

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ $(EXTENSION_LIB): $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EX
173173
ifeq ($(UNAME_S),Darwin)
174174
$(CC) -g -fPIC -dynamiclib $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EXECUTOR_OBJS_PIC) -o $@ -undefined dynamic_lookup
175175
else ifneq (,$(findstring MINGW,$(UNAME_S)))
176-
$(CC) -shared $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EXECUTOR_OBJS_PIC) -o $@ -lsqlite3
176+
$(CC) -shared $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EXECUTOR_OBJS_PIC) -o $@ -lsqlite3 -lsystre
177177
else ifneq (,$(findstring MSYS,$(UNAME_S)))
178-
$(CC) -shared $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EXECUTOR_OBJS_PIC) -o $@ -lsqlite3
178+
$(CC) -shared $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EXECUTOR_OBJS_PIC) -o $@ -lsqlite3 -lsystre
179179
else
180180
$(CC) -shared -fPIC $(EXTENSION_OBJ) $(PARSER_OBJS_PIC) $(TRANSFORM_OBJS_PIC) $(EXECUTOR_OBJS_PIC) -o $@
181181
endif

‎tests/performance/run_all_perf.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ run_tests_for_size() {
192192
local size_label=$(fmt_num $size)
193193
echo "Building ${size_label} node graph..."
194194

195-
db=$(mktemp /tmp/gql_perf_$$.db)
195+
db=$(mktemp /tmp/gql_perf_XXXXXX.db)
196196

197197
# Build graph once
198198
start=$(get_time_ms)

‎tests/performance/run_pagerank_perf.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ test_pagerank_scale() {
146146
local size=$1
147147
local edges_per_node=$2
148148
local pr_iterations=${3:-20}
149-
local db=$(mktemp /tmp/gql_pagerank_$$.db)
149+
local db=$(mktemp /tmp/gql_pagerank_XXXXXX.db)
150150

151151
echo "=== PageRank Test (n=$size, edges/node=$edges_per_node, pr_iter=$pr_iterations) ==="
152152

@@ -185,7 +185,7 @@ test_pagerank_scale() {
185185
# ============================================
186186
test_iteration_impact() {
187187
local size=$1
188-
local db=$(mktemp /tmp/gql_pagerank_iter_$$.db)
188+
local db=$(mktemp /tmp/gql_pagerank_iter_XXXXXX.db)
189189

190190
echo "=== Iteration Impact (n=$size) ==="
191191

‎tests/performance/run_scaled_perf_tests.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ EOF
192192
# ============================================
193193
test_linear_chain() {
194194
local size=$1
195-
local db=$(mktemp /tmp/gql_linear_$$.db)
195+
local db=$(mktemp /tmp/gql_linear_XXXXXX.db)
196196

197197
echo "=== Linear Chain Graph (n=$size) ==="
198198
echo "Structure: 1->2->3->...->$size"
@@ -234,7 +234,7 @@ test_linear_chain() {
234234
# ============================================
235235
test_hub_spoke() {
236236
local size=$1
237-
local db=$(mktemp /tmp/gql_hub_$$.db)
237+
local db=$(mktemp /tmp/gql_hub_XXXXXX.db)
238238

239239
echo "=== Hub-and-Spoke Graph (n=$size) ==="
240240
echo "Structure: Hub connected to $((size-1)) spokes"
@@ -299,7 +299,7 @@ EOF
299299
test_dense_mesh() {
300300
local size=$1
301301
local conn=$2
302-
local db=$(mktemp /tmp/gql_mesh_$$.db)
302+
local db=$(mktemp /tmp/gql_mesh_XXXXXX.db)
303303

304304
echo "=== Dense Mesh Graph (n=$size, connectivity=$conn) ==="
305305
echo "Structure: Each node connects to next $conn nodes"
@@ -341,7 +341,7 @@ test_dense_mesh() {
341341
# ============================================
342342
test_tree() {
343343
local depth=$1
344-
local db=$(mktemp /tmp/gql_tree_$$.db)
344+
local db=$(mktemp /tmp/gql_tree_XXXXXX.db)
345345
local total=$(( (1 << (depth + 1)) - 1 ))
346346

347347
echo "=== Binary Tree Graph (depth=$depth) ==="

0 commit comments

Comments
 (0)