Răsfoiți Sursa

BugFix for CI/CD

Yuki Takei 7 ani în urmă
părinte
comite
d2dc8ec809
2 a modificat fișierele cu 5 adăugiri și 3 ștergeri
  1. 1 1
      bin/wercker/trigger-growi-docker.sh
  2. 4 2
      wercker.yml

+ 1 - 1
bin/wercker/trigger-growi-docker.sh

@@ -24,7 +24,7 @@ RESPONSE=`curl -X POST \
       }, \
       { \
         "key": "GROWI_REPOS_GIT_COMMIT", \
-        "value": "'$WERCKER_GIT_COMMIT'" \
+        "value": "'$RELEASE_GIT_COMMIT'" \
       } \
     ] \
   }' \

+ 4 - 2
wercker.yml

@@ -147,12 +147,12 @@ release: # would be run on release branch
         TMP_RELEASE_BRANCH=tmp/release-$RELEASE_VERSION
         git checkout -B $TMP_RELEASE_BRANCH
         git push -u origin HEAD:$TMP_RELEASE_BRANCH
-        TARGET_COMMITISH=`git rev-parse HEAD`
+        export RELEASE_GIT_COMMIT=`git rev-parse HEAD`
 
     - github-create-release:
       token: $GITHUB_TOKEN
       tag: v$RELEASE_VERSION
-      target-commitish: $TARGET_COMMITISH
+      target-commitish: $RELEASE_GIT_COMMIT
 
     - script:
       name: remove temporary release branch
@@ -180,7 +180,9 @@ release-rc: # would be run on rc/* branches
       name: get RELEASE_VERSION
       code: |
         export RELEASE_VERSION=`npm run version --silent`
+        export RELEASE_GIT_COMMIT=$WERCKER_GIT_COMMIT
         echo "export RELEASE_VERSION=$RELEASE_VERSION"
+        echo "export RELEASE_GIT_COMMIT=$RELEASE_GIT_COMMIT"
 
     - script:
       name: trigger growi-docker release-rc pipeline