Skip to content

Commit

Permalink
Merge pull request #27 from desci-labs/m0ar/package-split-and-cli
Browse files Browse the repository at this point in the history
Package split and basic CLI
  • Loading branch information
m0ar authored Dec 14, 2023
2 parents d2d29b8 + 69795bd commit 4013fb0
Show file tree
Hide file tree
Showing 72 changed files with 19,865 additions and 9,647 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
src/__generated__/*
**/__generated__/*
dist
1 change: 0 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ jobs:
cache-dependency-path: "package-lock.json"
check-latest: false
- run: npm ci
- run: npm run generate
- run: make test
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
node_modules
admin_seed.txt
local-data
src/__generated__/*
composedb.config.json
test.config.json
*.tsbuildinfo
.vscode
dist
3 changes: 0 additions & 3 deletions .vscode/extensions.json

This file was deleted.

39 changes: 0 additions & 39 deletions .vscode/settings.json

This file was deleted.

22 changes: 7 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
.PHONY: clean clean-test test

clean:
rm -rf node_modules local-data
rm -rf node_modules
$(MAKE) -C packages/composedb clean

clean-test:
rm -rf local-data/ceramic-test
$(MAKE) -C packages/composedb clean-test

test: clean-test
if pgrep --older 1 --count --full "ceramic daemon|ipfs daemon"; then \
echo "Refusing to clobber running daemons"; exit 1; \
fi

sed 's|local-data/ceramic|local-data/ceramic-test|' composedb.config.json \
> test.config.json
npx ceramic daemon --config test.config.json &>/dev/null &
sleep 5

npm run deployComposites
$(MAKE) -C packages/composedb start-test-env
# Ensure daemons dead, without losing test exit code for CI
if npm test; then \
npm run kill; true; \
if npm run test --workspace packages/lib; then \
$(MAKE) -C packages/composedb kill-test-env; true; \
else \
npm run kill; false; \
$(MAKE) -C packages/composedb kill-test-env; false; \
fi
Loading

0 comments on commit 4013fb0

Please sign in to comment.