Merge pull request petehouston#1 from petehouston/test-pull-request

Update pull_request
elliottkember · Apr 21, 2021 · a49df9a · a49df9a
2 parents d37e0d3 + 547602e
commit a49df9a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -7,8 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          path: "github-actions-query-branch-name"
       - name: Export as default variable GIT_BRANCH_NAME
         uses: ./
         id: getGitBranch1

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -7,8 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-#        with:
-#          path: "github-actions-query-branch-name"
       - name: Export as default variable GIT_BRANCH_NAME
         uses: ./
         id: getGitBranch1

diff --git a/dist/index.js b/dist/index.js
@@ -475,15 +475,17 @@ async function run() {
 
         // check if this is a pull request
         if (process.env.GITHUB_EVENT_NAME === 'pull_request') {
-            const baseBranchName = process.env.GITHUB_BASE_REF.split('/').slice(2).join('/');
-            // const baseBranchName = process.env.GITHUB_BASE_REF;
+            const baseBranchName = process.env.GITHUB_BASE_REF;
             core.exportVariable(`${name}_BASE`, baseBranchName);
             core.setOutput(`${OutputGitBranchName}_base`, baseBranchName);
 
-            const headBranchName = process.env.GITHUB_HEAD_REF.split('/').slice(2).join('/');
-            // const headBranchName = process.env.GITHUB_HEAD_REF;
+            const headBranchName = process.env.GITHUB_HEAD_REF;
             core.exportVariable(`${name}_HEAD`, headBranchName);
             core.setOutput(`${OutputGitBranchName}_head`, headBranchName);
+
+            // set default branch name to head
+            core.exportVariable(name, headBranchName);
+            core.setOutput(OutputGitBranchName, headBranchName);
         }
     }
     catch (error) {

diff --git a/index.js b/index.js
@@ -15,15 +15,17 @@ async function run() {
 
         // check if this is a pull request
         if (process.env.GITHUB_EVENT_NAME === 'pull_request') {
-            const baseBranchName = process.env.GITHUB_BASE_REF.split('/').slice(2).join('/');
-            // const baseBranchName = process.env.GITHUB_BASE_REF;
+            const baseBranchName = process.env.GITHUB_BASE_REF;
             core.exportVariable(`${name}_BASE`, baseBranchName);
             core.setOutput(`${OutputGitBranchName}_base`, baseBranchName);
 
-            const headBranchName = process.env.GITHUB_HEAD_REF.split('/').slice(2).join('/');
-            // const headBranchName = process.env.GITHUB_HEAD_REF;
+            const headBranchName = process.env.GITHUB_HEAD_REF;
             core.exportVariable(`${name}_HEAD`, headBranchName);
             core.setOutput(`${OutputGitBranchName}_head`, headBranchName);
+
+            // set default branch name to head
+            core.exportVariable(name, headBranchName);
+            core.setOutput(OutputGitBranchName, headBranchName);
         }
     }
     catch (error) {