Explorar o código

ci: attempt to fix website deploy condition

Renée Kooi %!s(int64=5) %!d(string=hai) anos
pai
achega
c4f5e30a19
Modificáronse 2 ficheiros con 3 adicións e 6 borrados
  1. 2 5
      .travis.yml
  2. 1 1
      package.json

+ 2 - 5
.travis.yml

@@ -60,9 +60,6 @@ install:
 script:
 - 'if [ -n "${LINT-}" ]; then npm run lint; fi'
 - 'if [ -n "${LINT-}" ]; then npm run test:type; fi'
-# only install website deps when we're going to deploy;
-# note this should be removed when the lerna-link-convert switch happens
-- 'if [ -n "${WEBSITE-}" ]; then npm run web:install; fi'
 - 'if [ -n "${UNIT-}" ]; then npm run test:unit; fi'
 - 'if [ -n "${COMPANION-}" ]; then npm run test:companion; fi'
 - 'if [ -n "${ENDTOEND-}" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run test:endtoend; fi'
@@ -120,10 +117,10 @@ deploy:
   script: bin/travis-deploy
   on:
     branch: master
-    condition: $WEBSITE = true
+    condition: env(WEBSITE) = true
 - provider: script
   skip_cleanup: true
   script: packages/@uppy/companion/infra/kube/gcloud-deploy.sh
   on:
     branch: master
-    condition: $COMPANION = true
+    condition: env(COMPANION) = true

+ 1 - 1
package.json

@@ -145,7 +145,7 @@
     "web:deploy": "npm-run-all web:clean web:inject-disc web:build && ./bin/web-deploy",
     "web:generate": "cd website && touch db.json && ./node_modules/.bin/hexo generate",
     "web:inject-bundles-misc": "cd website && node inject.js",
-    "web:inject-disc": "node ./bin/disc.js",
+    "web:inject-disc": "npm run build:lib && node ./bin/disc.js",
     "web:inject-frontpagecodesample": "npm run web:generate && cp -f website/public/frontpage-code-sample.html website/themes/uppy/layout/partials/frontpage-code-sample.html && touch website/themes/uppy/layout/index.ejs",
     "web:install": "cd website && npm install",
     "web:start": "npm-run-all build:lib --parallel watch:css web:watch-examples web:bundle-watch-inject web:watch",