Skip to content

Commit 62f4177

Browse files
committed
Try other variable passing
1 parent 9756f69 commit 62f4177

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

GitHubActions/build_sqlite_fdw.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ mkdir -p ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw
2121
tar zxf ./sqlite_fdw.tar.gz -C ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw/
2222
cd ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw
2323

24-
vars='CI_ENV=1'
25-
2624
if [ "$MODE" == "postgis" ]; then
27-
make $vars ENABLE_GIS=1
25+
make CI_ENV=1 ENABLE_GIS=1
2826
else
29-
make $vars
27+
make CI_ENV=1
3028
fi
3129

3230
sudo make install

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ REGRESS := $(addprefix $(REGRESS_PREFIX_SUB)/,$(REGRESS))
7979
$(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/extra)
8080
$(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/types)
8181

82+
# $(info ENABLE_GIS is $(ENABLE_GIS))
83+
$(info CI_ENV is $(CI_ENV))
8284
# $(info SHLIB_LINK is $(SHLIB_LINK))
8385
# $(info LD_LIBRARY_PATH is $(LD_LIBRARY_PATH))
86+
$(info PG_CFLAGS is $(PG_CFLAGS))
8487
# $(info REGRESS is $(REGRESS))
8588
# $(info DLSUFFIX is $(DLSUFFIX))
86-
# $(info CI_ENV is $(CI_ENV))
87-
# $(info ENABLE_GIS is $(ENABLE_GIS))
8889

8990
ifdef ENABLE_GIS
9091
check: temp-install

0 commit comments

Comments
 (0)