Unverified Commit 28e574bc authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #7336 from oranagra/modules_ci_32bit

32bit CI needs to build modules correctly
parents a4efbd59 15bcb813
...@@ -47,7 +47,9 @@ jobs: ...@@ -47,7 +47,9 @@ jobs:
sudo apt-get install tcl8.5 sudo apt-get install tcl8.5
./runtest --accurate --verbose ./runtest --accurate --verbose
- name: module api test - name: module api test
run: ./runtest-moduleapi --verbose run: |
make -C tests/modules 32bit # the script below doesn't have an argument, we must build manually ahead of time
./runtest-moduleapi --verbose
test-tls: test-tls:
runs-on: ubuntu-latest runs-on: ubuntu-latest
......
...@@ -28,11 +28,14 @@ TEST_MODULES = \ ...@@ -28,11 +28,14 @@ TEST_MODULES = \
all: $(TEST_MODULES) all: $(TEST_MODULES)
32bit:
$(MAKE) CFLAGS="-m32" LDFLAGS="-melf_i386"
%.xo: %.c ../../src/redismodule.h %.xo: %.c ../../src/redismodule.h
$(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ $(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@
%.so: %.xo %.so: %.xo
$(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LIBS) -lc $(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LDFLAGS) $(LIBS) -lc
.PHONY: clean .PHONY: clean
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment