Merge branch 'main' into main

tj-actions · Nov 13, 2022 · 845631c · 845631c
2 parents 311807f + 33a039d
commit 845631c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -41,22 +41,22 @@ jobs:
           echo "Is Tag: ${{ steps.branch-name.outputs.is_tag }}"
           echo "Current tag: ${{ steps.branch-name.outputs.tag }}"
       - name: Test is_default output for pull request
-        if: github.event_name == 'pull_request' && steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default != 'false'
+        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default != 'false'
         run: |
           echo "Is default is invalid: ${{ steps.branch-name.outputs.is_default }}"
           exit 1
       - name: Test is_default output for non pull request
-        if: github.event_name != 'pull_request' && steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default != 'true'
+        if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target' && steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default != 'true'
         run: |
           echo "Is default is invalid: ${{ steps.branch-name.outputs.is_default }}"
           exit 1
       - name: Test base_ref_branch output
-        if: github.event_name == 'pull_request' && steps.branch-name.outputs.is_tag == 'false' && !steps.branch-name.outputs.base_ref_branch
+        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && steps.branch-name.outputs.is_tag == 'false' && !steps.branch-name.outputs.base_ref_branch
         run: |
           echo "Base ref unset: ${{ steps.branch-name.outputs.base_ref_branch }}"
           exit 1
       - name: Test head_ref output
-        if: github.event_name == 'pull_request' && steps.branch-name.outputs.is_tag == 'false' && !steps.branch-name.outputs.head_ref_branch
+        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && steps.branch-name.outputs.is_tag == 'false' && !steps.branch-name.outputs.head_ref_branch
         run: |
           echo "Head ref unset: ${{ steps.branch-name.outputs.head_ref_branch }}"
           exit 1
@@ -65,8 +65,8 @@ jobs:
         run: |
           echo "Ref unset: ${{ steps.branch-name.outputs.ref_branch }}"
           exit 1
-      - name: Test current_branch output for pull_request event.
-        if: github.event_name == 'pull_request' && steps.branch-name.outputs.is_tag == 'false' && !steps.branch-name.outputs.current_branch
+      - name: Test current_branch output for pull_request or pull_request_target event.
+        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && steps.branch-name.outputs.is_tag == 'false' && !steps.branch-name.outputs.current_branch
         run: |
           echo "Current branch unset: ${{ steps.branch-name.outputs.current_branch }}"
           exit 1

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,24 +1,38 @@
 # Changelog
 
-## [Unreleased](https://github.com/tj-actions/branch-names/tree/HEAD)
+## [v6.3](https://github.com/tj-actions/branch-names/tree/v6.3) (2022-11-12)
 
-[Full Changelog](https://github.com/tj-actions/branch-names/compare/v6.2...HEAD)
+[Full Changelog](https://github.com/tj-actions/branch-names/compare/v6...v6.3)
+
+## [v6](https://github.com/tj-actions/branch-names/tree/v6) (2022-11-12)
+
+[Full Changelog](https://github.com/tj-actions/branch-names/compare/v6.2...v6)
 
 **Fixed bugs:**
 
+- \[BUG\] all outputs show default branch when on a PR branch [\#190](https://github.com/tj-actions/branch-names/issues/190)
 - \[BUG\] Usage of set-output triggers warnings during workflow. [\#180](https://github.com/tj-actions/branch-names/issues/180)
 
-## [v6.2](https://github.com/tj-actions/branch-names/tree/v6.2) (2022-10-16)
+**Closed issues:**
 
-[Full Changelog](https://github.com/tj-actions/branch-names/compare/v6...v6.2)
+- Dependency Dashboard [\#36](https://github.com/tj-actions/branch-names/issues/36)
 
-## [v6](https://github.com/tj-actions/branch-names/tree/v6) (2022-10-16)
+**Merged pull requests:**
 
-[Full Changelog](https://github.com/tj-actions/branch-names/compare/v6.1...v6)
+- fix: bug with branch name with PR's from forks [\#193](https://github.com/tj-actions/branch-names/pull/193) ([jackton1](https://github.com/jackton1))
+- chore: update test [\#191](https://github.com/tj-actions/branch-names/pull/191) ([jackton1](https://github.com/jackton1))
+- Update tj-actions/auto-doc action to v1.4.3 [\#189](https://github.com/tj-actions/branch-names/pull/189) ([renovate[bot]](https://github.com/apps/renovate))
+- Updated README.md [\#188](https://github.com/tj-actions/branch-names/pull/188) ([jackton1](https://github.com/jackton1))
+- Update tj-actions/auto-doc action to v1.4.2 [\#187](https://github.com/tj-actions/branch-names/pull/187) ([renovate[bot]](https://github.com/apps/renovate))
+- Update peter-evans/create-pull-request action to v4.2.0 [\#186](https://github.com/tj-actions/branch-names/pull/186) ([renovate[bot]](https://github.com/apps/renovate))
+- Update pascalgn/automerge-action action to v0.15.5 [\#185](https://github.com/tj-actions/branch-names/pull/185) ([renovate[bot]](https://github.com/apps/renovate))
+- Update peter-evans/create-pull-request action to v4.1.4 [\#184](https://github.com/tj-actions/branch-names/pull/184) ([renovate[bot]](https://github.com/apps/renovate))
+- Update tj-actions/verify-changed-files action to v12 [\#183](https://github.com/tj-actions/branch-names/pull/183) ([renovate[bot]](https://github.com/apps/renovate))
+- Upgraded to v6.2 [\#182](https://github.com/tj-actions/branch-names/pull/182) ([jackton1](https://github.com/jackton1))
 
-**Closed issues:**
+## [v6.2](https://github.com/tj-actions/branch-names/tree/v6.2) (2022-10-16)
 
-- Dependency Dashboard [\#36](https://github.com/tj-actions/branch-names/issues/36)
+[Full Changelog](https://github.com/tj-actions/branch-names/compare/v6.1...v6.2)
 
 **Merged pull requests:**