Merge pull request #708 from cozy/test_publish

Fix publish script

Author: CPatchane

.travis.yml

@@ -40,31 +40,36 @@ deploy:
   - provider: script
     repo: cozy/cozy-collect
     skip-cleanup: true
-    script: DEPLOY_BRANCH=build && yarn deploy && yarn cozyPublish
+    script: export DEPLOY_BRANCH=build && yarn deploy && yarn cozyPublish
     on:
       branch: master
-    # We need to fetch the build branch since Travis only clone the job related branch and we don't push new builds on tags
   - provider: script
     repo: cozy/cozy-collect
     skip-cleanup: true
-    script: DEPLOY_BRANCH=latest && git fetch origin "$DEPLOY_BRANCH:$DEPLOY_BRANCH" && yarn cozyPublish
+    script: export DEPLOY_BRANCH=latest && yarn cozyPublish
     on:
       tags: true
   - provider: script
     repo: cozy/cozy-collect
     skip-cleanup: true
-    script: DEPLOY_BRANCH=latest && yarn deploy
+    script: export DEPLOY_BRANCH=latest && yarn cozyPublish
+    on:
+      branch: test_publish
+  - provider: script
+    repo: cozy/cozy-collect
+    skip-cleanup: true
+    script: export DEPLOY_BRANCH=latest && yarn deploy
     on:
       branch: prod
   - provider: script
     repo: cozy/cozy-collect
     skip-cleanup: true
-    script: DEPLOY_BRANCH=build_no_more_providers && yarn deploy
+    script: export DEPLOY_BRANCH=build_no_more_providers && yarn deploy
     on:
       branch: feature/no-more-providers
   - provider: script
     repo: cozy/cozy-collect
     skip-cleanup: true
-    script: DEPLOY_BRANCH=build_orange && yarn deploy
+    script: export DEPLOY_BRANCH=build_orange && yarn deploy
     on:
       branch: orange

package.json

@@ -12,7 +12,7 @@
     "commons:watch": "cozy-scripts watch",
     "commons:watch:standalone": "cozy-scripts standalone",
     "deploy": "git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build} --repo=${DEPLOY_REPOSITORY:-https://[email protected]/cozy/cozy-collect.git}",
-    "cozyPublish": "cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})",
+    "cozyPublish": "git fetch origin ${DEPLOY_BRANCH:-build}:${DEPLOY_BRANCH:-build} && cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})",
     "tx": "tx pull --all || true",
     "precommons:build": "npm-run-all lint tx",
     "prebuild:browser": "npm run clean:browser",