Skip to content

Commit 8205f38

Browse files
chore: fix ci build
- move setup into dedicated script
1 parent 598ca8a commit 8205f38

File tree

31 files changed

+66
-7
lines changed

31 files changed

+66
-7
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ dist
1010
.env
1111
.aws-docker
1212
.tsconfig.*
13+
.profile
14+
.yarn-cache

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ cache:
1616
- packages/dandi-contrib/mvc-view-pug/node_modules
1717

1818
install:
19-
- "yarn"
20-
- "tsc --version"
21-
- "ts-node --version"
22-
- "pushd builder && yarn install && popd"
23-
- "yarn install-packages"
19+
- "yarn setup"
20+
- "yarn tsc --version"
21+
- "yarn ts-node --version"
2422

2523
script:
24+
- "yarn build"
2625
- "yarn coverage"
26+
27+
after_script:
2728
- "yarn coverage-report"
28-
- "yarn build"

.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

builder/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.0.0-alpha.50",
55
"description": "",
66
"scripts": {
7-
"setup": "yarn && pushd builder && yarn && yarn link && popd && yarn link @dandi/builder && yarn install-packages",
7+
"setup": "./setup",
88
"install-packages": "builder yarn install",
99
"publish-packages": "builder publish",
1010
"update-package-configs": "builder update-configs",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/cache/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/common/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/config/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/core-node/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/core/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/data/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/hal/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/http-model/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/http-pipeline/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/http/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/logging/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/model-builder/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/model/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/mvc-hal/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/mvc-view/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

packages/dandi/mvc/.yarnrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cache-folder "./.yarn-cache"

setup

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash
2+
3+
TEXT_RESET="tput sgr0"
4+
TEXT_BOLD="tput bold"
5+
COLOR_MAGENTA="tput setaf 5"
6+
7+
log() {
8+
log_msg=$1
9+
printf "%b\n" "$($TEXT_BOLD)$($COLOR_MAGENTA)[@dandi setup]$($TEXT_RESET) ${log_msg}"
10+
}
11+
12+
exit_on_error() {
13+
err_msg=$1
14+
log "Error: ${err_msg}"
15+
exit 1
16+
}
17+
18+
safe_run() {
19+
cmd=$1
20+
log_msg=$2
21+
log "${log_msg}"
22+
eval "$cmd" 2>&1 || exit_on_error "${err_msg}"
23+
log "Done.\n"
24+
}
25+
26+
safe_run yarn "Installing project dependencies..."
27+
safe_run "cd builder && yarn" "Installing builder dependencies..."
28+
safe_run "yarn link && cd .. && yarn link @dandi/builder" "Linking builder..."
29+
safe_run "yarn install-packages" "Installing @dandi package dependencies..."
30+
log Success!

0 commit comments

Comments
 (0)