Просмотр исходного кода

fix wercker.yml (release)

merge trigger-crowi-plus-docker into release
Yuki Takei 9 лет назад
Родитель
Сommit
72b3004f53
1 измененных файлов с 10 добавлено и 12 удалено
  1. 10 12
      wercker.yml

+ 10 - 12
wercker.yml

@@ -74,6 +74,12 @@ build-dev:
 
 
 release: # would be run on release branch
 release: # would be run on release branch
   steps:
   steps:
+    - script:
+      name: install jq
+      code: |
+        apt-get update
+        apt-get install -y jq
+
     - script:
     - script:
       name: bump version
       name: bump version
       code: |
       code: |
@@ -81,8 +87,8 @@ release: # would be run on release branch
         # npm version to bump version
         # npm version to bump version
         npm version patch
         npm version patch
         # get version
         # get version
-        export RELEASE_VERSION=`npm run version --silent`
-        echo "export RELEASE_VERSION=$RELEASE_VERSION"
+        RELEASE_VERSION=`npm run version --silent`
+        echo "RELEASE_VERSION=$RELEASE_VERSION"
 
 
     - script:
     - script:
       name: commit and push
       name: commit and push
@@ -102,15 +108,7 @@ release: # would be run on release branch
       code: |
       code: |
         git push --delete origin $TMP_RELEASE_BRANCH
         git push --delete origin $TMP_RELEASE_BRANCH
 
 
-
-trigger-crowi-plus-docker:
-  steps:
-    - script:
-      name: install jq
-      code: |
-        apt-get update
-        apt-get install -y jq
-
     - script:
     - script:
       name: trigger crowi-plus-docker release pipeline
       name: trigger crowi-plus-docker release pipeline
-      code: sh ./bin/wercker/trigger-crowi-plus-docker.sh
+      code: |
+        sh ./bin/wercker/trigger-crowi-plus-docker.sh