Skip to content

Commit 86e562d

Browse files
oranagraantirez
authored andcommittedMay 28, 2020
32bit CI needs to build modules correctly
1 parent ab2984b commit 86e562d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed
 

‎.github/workflows/daily.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
sudo apt-get install tcl8.5
4848
./runtest --accurate --verbose
4949
- name: module api test
50-
run: ./runtest-moduleapi --verbose
50+
run: |
51+
make -C tests/modules 32bit # the script below doesn't have an argument, we must build manually ahead of time
52+
./runtest-moduleapi --verbose
5153
5254
test-tls:
5355
runs-on: ubuntu-latest

‎tests/modules/Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,14 @@ TEST_MODULES = \
2828

2929
all: $(TEST_MODULES)
3030

31+
32bit:
32+
$(MAKE) CFLAGS="-m32" LDFLAGS="-melf_i386"
33+
3134
%.xo: %.c ../../src/redismodule.h
3235
$(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@
3336

3437
%.so: %.xo
35-
$(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LIBS) -lc
38+
$(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LDFLAGS) $(LIBS) -lc
3639

3740
.PHONY: clean
3841

0 commit comments

Comments
 (0)
Please sign in to comment.