Browse Source

Update variables (#454)

due to https://github.com/v2fly/V2BuildAssist/pull/4
Loyalsoldier 5 years ago
parent
commit
e74c03541e
3 changed files with 8 additions and 8 deletions
  1. 4 4
      azure-pipelines.yml
  2. 2 2
      release/bleedingrelease.sh
  3. 2 2
      release/tagrelease.sh

+ 4 - 4
azure-pipelines.yml

@@ -33,13 +33,13 @@ steps:
     displayName: "Generate Bleeding Edge Release"
     env:
       WORKDIR: $(system.defaultWorkingDirectory)
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
+      PERSONAL_TOKEN: $(GITHUB_TOKEN)
       PRERELEASE: true
       RELEASE_TAG: unstable-$(Build.SourceVersion)
       RELEASE_SHA: $(Build.SourceVersion)
       TRIGGER_REASON: $(Build.SourceBranch)
-      GITHUB_REPO_OWNER: v2fly
-      GITHUB_REPO_NAME: v2ray-core
+      COMMENT_TARGETTED_REPO_OWNER: v2fly
+      COMMENT_TARGETTED_REPO_NAME: v2ray-core
   - script: |
       echo $RELEASE_TAG
       ./release/tagrelease.sh
@@ -47,7 +47,7 @@ steps:
     displayName: "Generate Tag Release"
     env:
       WORKDIR: $(system.defaultWorkingDirectory)
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
+      PERSONAL_TOKEN: $(GITHUB_TOKEN)
       PRERELEASE: true
       RELEASE_TAG: unstable-$(Build.SourceVersion)
       RELEASE_SHA: $(Build.SourceVersion)

+ 2 - 2
release/bleedingrelease.sh

@@ -4,7 +4,7 @@ RELBODY="https://github.com/v2fly/v2ray-core/commit/${RELEASE_SHA}"
 JSON_DATA=$(echo "{}" | jq -c ".tag_name=\"${RELEASE_TAG}\"")
 JSON_DATA=$(echo ${JSON_DATA} | jq -c ".prerelease=${PRERELEASE}")
 JSON_DATA=$(echo ${JSON_DATA} | jq -c ".body=\"${RELBODY}\"")
-RELEASE_DATA=$(curl --data "${JSON_DATA}" -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/v2fly/V2FlyBleedingEdgeBinary/releases)
+RELEASE_DATA=$(curl --data "${JSON_DATA}" -H "Authorization: token ${PERSONAL_TOKEN}" -X POST https://api.github.com/repos/v2fly/V2FlyBleedingEdgeBinary/releases)
 echo $RELEASE_DATA
 RELEASE_ID=$(echo $RELEASE_DATA | jq ".id")
 
@@ -13,7 +13,7 @@ function uploadfile() {
   CTYPE=$(file -b --mime-type $FILE)
 
   sleep 1
-  curl -H "Authorization: token ${GITHUB_TOKEN}" -H "Content-Type: ${CTYPE}" --data-binary @$FILE "https://uploads.github.com/repos/v2fly/V2FlyBleedingEdgeBinary/releases/${RELEASE_ID}/assets?name=$(basename $FILE)"
+  curl -H "Authorization: token ${PERSONAL_TOKEN}" -H "Content-Type: ${CTYPE}" --data-binary @$FILE "https://uploads.github.com/repos/v2fly/V2FlyBleedingEdgeBinary/releases/${RELEASE_ID}/assets?name=$(basename $FILE)"
   sleep 1
 }
 

+ 2 - 2
release/tagrelease.sh

@@ -22,7 +22,7 @@ GITHUB_RELEASE_TAG=${TRIGGER_REASON:${#CONST_refsB}:25}
 
 echo ${GITHUB_RELEASE_TAG}
 
-RELEASE_DATA=$(curl -H "Authorization: token ${GITHUB_TOKEN}" -X GET https://api.github.com/repos/v2fly/v2ray-core/releases/tags/${GITHUB_RELEASE_TAG})
+RELEASE_DATA=$(curl -H "Authorization: token ${PERSONAL_TOKEN}" -X GET https://api.github.com/repos/v2fly/v2ray-core/releases/tags/${GITHUB_RELEASE_TAG})
 echo $RELEASE_DATA
 RELEASE_ID=$(echo $RELEASE_DATA | jq ".id")
 
@@ -33,7 +33,7 @@ function uploadfile() {
   CTYPE=$(file -b --mime-type $FILE)
 
   sleep 1
-  curl -H "Authorization: token ${GITHUB_TOKEN}" -H "Content-Type: ${CTYPE}" --data-binary @$FILE "https://uploads.github.com/repos/v2fly/v2ray-core/releases/${RELEASE_ID}/assets?name=$(basename $FILE)"
+  curl -H "Authorization: token ${PERSONAL_TOKEN}" -H "Content-Type: ${CTYPE}" --data-binary @$FILE "https://uploads.github.com/repos/v2fly/v2ray-core/releases/${RELEASE_ID}/assets?name=$(basename $FILE)"
   sleep 1
 }