fix: tag name

npm · May 23, 2021 · 09a8ea4 · 09a8ea4
1 parent 63405b4
commit 09a8ea4
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/create-cli-deps-pr.yml b/.github/workflows/create-cli-deps-pr.yml
@@ -14,7 +14,6 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.NPM_ROBOT_TOKEN }}
       NPM_VERSION: ${{ github.event.inputs.npmVersion }}
-      REPO: "nodejs/node"
     steps:
       - name: Checkout npm/node
         uses: actions/checkout@v2
@@ -25,16 +24,19 @@ jobs:
           token: ${{ secrets.NPM_ROBOT_TOKEN }}
       - name: Run dependency updates and create PR
         run: |
-          base_branch=$(( "$NPM_VERSION" == "latest" ? `npm view npm@latest version` : "v14.x-staging"))
-          release_branch_name="npm-$base_branch"
-          echo $base_branch
-          echo $NPM_VERSION
-          echo $release_branch
+          npm_tag=""
+          if [ "$NPM_VERSION" == "latest" ]
+          then 
+            npm_tag=`npm view npm@latest version`
+          else
+            npm_tag="$NPM_VERSION"
+          fi 
+
           git config user.name "npm-robot"
           git config user.email "ops+robot@npmjs.com"
-          git checkout -b "$release_branch_name"
-          ./tools/update-npm.sh "$NPM_VERSION"
-          git push origin "$release_branch_name"
-          gh_release_body=`gh release view v"$NPM_VERSION"" -R npm/cli`
+          git checkout -b "npm-$npm_tag"
+          ./tools/update-npm.sh "$npm_tag"
+          git push origin "npm-$npm_tag"
+          gh_release_body=`gh release view v"$npm_tag" -R npm/cli`
           echo $gh_release_body
           gh pr create -R "npm/node" -B "$base_branch" -H "npm:$release_branch_name" --title "deps(cli): upgrade npm to $npm_version" --body "$gh_release_body"