Skip to content

Commit

Permalink
Merge pull request #247 from desci-labs/m0ar/patch-ci-tests
Browse files Browse the repository at this point in the history
Fix compose test exit code
  • Loading branch information
m0ar authored Mar 21, 2024
2 parents fa0e03e + db8bec8 commit a2bb22a
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 11 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,15 @@ jobs:
- name: Set up the environment
# Replace this line with the appropriate setup for your project
# Examples:
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
node-version-file: ".nvmrc"
check-latest: false
cache: "yarn"
cache-dependency-path: |
desci-models/yarn.lock
desci-server/yarn.lock
desci-repo/yarn.lock
- name: Set up docker-compose
run: |
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/build-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,14 @@ jobs:
- name: Set up the environment
# Replace this line with the appropriate setup for your project
# Examples:
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
node-version-file: ".nvmrc"
check-latest: false
cache: "yarn"
cache-dependency-path: |
desci-models/yarn.lock
desci-server/yarn.lock
- name: Set up docker-compose
run: |
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/contracts-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ jobs:
- name: Set up the environment
# Replace this line with the appropriate setup for your project
# Examples:
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 18
node-version-file: ".nvmrc"
check-latest: false
cache: "yarn"
cache-dependency-path: "desci-contracts/yarn.lock"

- name: Install dependencies
run: cd desci-contracts && npm i -g yarn && yarn && yarn build
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/models-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ jobs:
- name: Set up the environment
# Replace this line with the appropriate setup for your project
# Examples:
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 16
node-version-file: ".nvmrc"
check-latest: false
cache: "yarn"
cache-dependency-path: "desci-models/yarn.lock"

- name: Set up docker-compose
run: |
Expand All @@ -40,4 +43,4 @@ jobs:

- name: Run tests
run: |
cd desci-models && yarn generate && yarn test
cd desci-models && yarn generate && yarn test
2 changes: 1 addition & 1 deletion desci-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prettier": "prettier --config .prettierrc --write './**/*.{ts,js,css,scss,json,md}'",
"test:destructive": "NODE_OPTIONS=\"--experimental-specifier-resolution=node --loader=ts-node/esm\" mocha --colors --require ts-node/register 'test/integration/**/*.test.ts' --timeout 20000 --exit",
"test:destructive:debug": "yarn test:destructive --inspect=0.0.0.0:9227",
"test": "yarn docker:test; docker-compose --file ../docker-compose.test.yml --compatibility down",
"test": "yarn docker:test; export EXIT=$(echo $?); docker-compose --file ../docker-compose.test.yml --compatibility down; exit $EXIT",
"coverage:destructive": "nyc --all --parser-plugins='[\"importAssertions\"]' -r lcov -e .ts -x \"*.test.ts\" npm run test:destructive",
"coverage:destructive:debug": "nyc --all --parser-plugins='[\"importAssertions\"]' -r lcov -e .ts -x \"*.test.ts\" npm run test:destructive:debug",
"commit": "git-cz",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: "3"

name: test
services:
nodes_test_db:
container_name: "nodes_test_db"
Expand Down

0 comments on commit a2bb22a

Please sign in to comment.