Skip to content

Commit 36bf3c7

Browse files
committed
new build system for extensions
1 parent e997992 commit 36bf3c7

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ env:
2626

2727
before_install:
2828
- yarn install
29-
- docker run -p 7777:5432 --name postgres -v `pwd`/packages:/sql-extensions -v `pwd`/node_modules:/sql-modules -d pyramation/postgres
29+
- docker run -p 7777:5432 --name postgres -v `pwd`/bin:/sql-bin -v `pwd`/packages:/sql-packages -v `pwd`/extensions:/sql-extensions -d pyramation/postgres
3030
- sleep 3
3131
- while ! docker exec -it postgres pg_isready -U postgres -h 127.0.0.1; do echo "$(date) - waiting for database to start"; sleep 1; done
32-
- while ! docker exec postgres /sql-extensions/install.sh; do echo "installing plugins"; sleep 3; done
32+
- while ! docker exec postgres /sql-bin/install.sh; do echo "installing plugins"; sleep 3; done
3333
- psql -f ./bootstrap-roles.sql postgres
3434
script:
3535
- cd $PACKAGE

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ dinstall:
2020
$(MAKE) docker-install
2121

2222
docker-install:
23-
docker exec launchql-postgres /sql-extensions/install.sh
23+
docker exec launchql-postgres /sql-bin/install.sh
2424

2525
k8-install:
2626
$(eval POD_NAME := $(shell kubectl get pods -l app=postgres -n webinc -o jsonpath="{.items[*].metadata.name}"))
27-
kubectl exec -n webinc -it $(POD_NAME) /sql-extensions/install.sh
27+
kubectl exec -n webinc -it $(POD_NAME) /sql-bin/install.sh
2828

2929
all:
3030
./build.sh lql package --version 0.0.1

packages/install.sh renamed to bin/install.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ function installit {
88
echo "SQL Module Directory $1 exists."
99
echo $1
1010
cd $1
11-
for x in $(ls -d */)
11+
12+
for x in $(find ./ -type f -name "sqitch.plan")
1213
do
13-
cd $x
14+
orig=$(pwd)
15+
dir=$(dirname $x)
16+
cd $dir
1417
make install
15-
cd ../
18+
cd $orig
1619
done
1720
cd $DIR
1821
else
@@ -22,4 +25,4 @@ function installit {
2225
}
2326

2427
installit /sql-extensions
25-
# installit /sql-modules
28+
installit /sql-packages

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ services:
1111
expose:
1212
- "5432"
1313
volumes:
14-
- ./packages:/sql-extensions
14+
- ./bin:/sql-bin
15+
- ./extensions:/sql-extensions
16+
- ./packages:/sql-packages

skitch.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"packages": [
3-
"packages/*"
3+
"packages/*",
4+
"extensions/*"
45
]
56
}

0 commit comments

Comments
 (0)