Merge pull request #654 from tj-actions/chore/add-back-ability-to-fetch-branch-history

chore: add back ability to fetch branch history
chore(deps): update peter-evans/create-pull-request action to v4.1.3
2022-09-28 20:49:21 -06:00 · 2022-09-28 20:42:32 -06:00 · 2022-09-28 00:42:48 -06:00 · 2022-09-25 10:53:48 -06:00 · 2022-09-25 16:47:06 +00:00 · 2022-09-25 09:46:20 -06:00
9 changed files with 86 additions and 54 deletions
--- a/.github/workflows/submodule-sync.yml
+++ b/.github/workflows/submodule-sync.yml
@@ -19,7 +19,7 @@ jobs:
          git submodule update --remote --recursive
      
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.1.2
+        uses: peter-evans/create-pull-request@v4.1.3
        with:
          title: "Updated submodule"
          branch: "chore/update-submodule"
--- a/.github/workflows/sync-release-version.yml
+++ b/.github/workflows/sync-release-version.yml
@@ -26,7 +26,7 @@ jobs:
        with:
          output: 'HISTORY.md'
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.1.2
+        uses: peter-evans/create-pull-request@v4.1.3
        with:
          base: "main"
          title: "Upgraded to ${{ steps.sync-release-version.outputs.new_version }}"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -136,14 +136,7 @@ jobs:

      - name: Run changed-files with a single commit history
        id: changed-files
-        continue-on-error: true
        uses: ./
-      
-      - name: Exit with 1 if no error is raised
-        if: github.event_name == 'pull_request' && steps.changed-files.outcome != 'failure'
-        run: |
-          echo "Expected: (failure) got ${{ steps.changed-files.outcome }}"
-          exit 1

      - name: Show output
        run: |
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -31,7 +31,7 @@ jobs:

      - name: Create Pull Request
        if: failure()
-        uses: peter-evans/create-pull-request@v4.1.2
+        uses: peter-evans/create-pull-request@v4.1.3
        with:
          base: "main"
          title: "Updated README.md"
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,12 +1,40 @@
 # Changelog

-## [v30.0.0](https://github.com/tj-actions/changed-files/tree/v30.0.0) (2022-09-24)
+## [v31.0.1](https://github.com/tj-actions/changed-files/tree/v31.0.1) (2022-09-25)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30...v30.0.0)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v31...v31.0.1)
+
+## [v31](https://github.com/tj-actions/changed-files/tree/v31) (2022-09-25)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v31.0.0...v31)
+
+**Merged pull requests:**
+
+- fix: bug with force pushed commits [\#651](https://github.com/tj-actions/changed-files/pull/651) ([jackton1](https://github.com/jackton1))
+- Upgraded to v31.0.0 [\#650](https://github.com/tj-actions/changed-files/pull/650) ([jackton1](https://github.com/jackton1))
+
+## [v31.0.0](https://github.com/tj-actions/changed-files/tree/v31.0.0) (2022-09-25)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30...v31.0.0)
+
+**Merged pull requests:**
+
+- chore: updated test [\#649](https://github.com/tj-actions/changed-files/pull/649) ([jackton1](https://github.com/jackton1))
+- chore: update docs [\#648](https://github.com/tj-actions/changed-files/pull/648) ([jackton1](https://github.com/jackton1))
+- chore: remove logging the github context [\#647](https://github.com/tj-actions/changed-files/pull/647) ([jackton1](https://github.com/jackton1))
+- chore: improve debug message. [\#646](https://github.com/tj-actions/changed-files/pull/646) ([jackton1](https://github.com/jackton1))
+- feat: use the last remote commit sha by default for push events [\#644](https://github.com/tj-actions/changed-files/pull/644) ([jackton1](https://github.com/jackton1))
+- chore: update test [\#643](https://github.com/tj-actions/changed-files/pull/643) ([jackton1](https://github.com/jackton1))
+- chore: update broken link [\#642](https://github.com/tj-actions/changed-files/pull/642) ([jackton1](https://github.com/jackton1))
+- Upgraded to v30.0.0 [\#641](https://github.com/tj-actions/changed-files/pull/641) ([jackton1](https://github.com/jackton1))

 ## [v30](https://github.com/tj-actions/changed-files/tree/v30) (2022-09-24)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v29.0.9...v30)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v30.0.0...v30)
+
+## [v30.0.0](https://github.com/tj-actions/changed-files/tree/v30.0.0) (2022-09-24)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v29.0.9...v30.0.0)

 **Fixed bugs:**

@@ -21,7 +49,7 @@

 - feat: add support for closed pull requests with merge true [\#640](https://github.com/tj-actions/changed-files/pull/640) ([jackton1](https://github.com/jackton1))
 - chore: log the github context in the test [\#638](https://github.com/tj-actions/changed-files/pull/638) ([jackton1](https://github.com/jackton1))
- feat: add support for running action on pull request close event [\#637](https://github.com/tj-actions/changed-files/pull/637) ([jackton1](https://github.com/jackton1))
+- chore: update test to run workflow on pull request close event [\#637](https://github.com/tj-actions/changed-files/pull/637) ([jackton1](https://github.com/jackton1))
 - chore\(deps\): update peter-evans/create-pull-request action to v4.1.2 [\#636](https://github.com/tj-actions/changed-files/pull/636) ([renovate[bot]](https://github.com/apps/renovate))
 - chore\(deps\): update codacy/codacy-analysis-cli-action action to v4.2.0 [\#634](https://github.com/tj-actions/changed-files/pull/634) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded to v29.0.9 [\#633](https://github.com/tj-actions/changed-files/pull/633) ([jackton1](https://github.com/jackton1))
@@ -891,7 +919,7 @@

 ## [v13](https://github.com/tj-actions/changed-files/tree/v13) (2022-02-17)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v2.0.1...v13)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.2...v13)

 **Implemented enhancements:**

@@ -910,13 +938,13 @@
 - \[BUG\] wrong result of any\_change output [\#314](https://github.com/tj-actions/changed-files/issues/314)
 - \[BUG\] Investigate possible bug using since\_last\_remote\_commit when force pushing changes. [\#303](https://github.com/tj-actions/changed-files/issues/303)

-## [v2.0.1](https://github.com/tj-actions/changed-files/tree/v2.0.1) (2021-12-30)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.2...v2.0.1)
-
 ## [v12.2](https://github.com/tj-actions/changed-files/tree/v12.2) (2021-12-30)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.1...v12.2)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v2.0.1...v12.2)
+
+## [v2.0.1](https://github.com/tj-actions/changed-files/tree/v2.0.1) (2021-12-30)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.1...v2.0.1)

 **Merged pull requests:**

@@ -1066,7 +1094,7 @@

 ## [v1.2.1](https://github.com/tj-actions/changed-files/tree/v1.2.1) (2021-11-08)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.2.0...v1.2.1)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.5...v1.2.1)

 **Implemented enhancements:**

@@ -1080,13 +1108,13 @@
 - Update actions/checkout action to v2.4.0 [\#243](https://github.com/tj-actions/changed-files/pull/243) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded to v11.5 [\#241](https://github.com/tj-actions/changed-files/pull/241) ([jackton1](https://github.com/jackton1))

-## [v1.2.0](https://github.com/tj-actions/changed-files/tree/v1.2.0) (2021-10-30)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.5...v1.2.0)
-
 ## [v11.5](https://github.com/tj-actions/changed-files/tree/v11.5) (2021-10-30)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.4...v11.5)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.2.0...v11.5)
+
+## [v1.2.0](https://github.com/tj-actions/changed-files/tree/v1.2.0) (2021-10-30)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.4...v1.2.0)

 **Merged pull requests:**

@@ -1478,7 +1506,7 @@

 ## [v7](https://github.com/tj-actions/changed-files/tree/v7) (2021-06-09)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6...v7)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.3...v7)

 **Closed issues:**

@@ -1494,13 +1522,13 @@
 - Update tj-actions/sync-release-version action to v8.7 [\#86](https://github.com/tj-actions/changed-files/pull/86) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded to v6.3 [\#85](https://github.com/tj-actions/changed-files/pull/85) ([jackton1](https://github.com/jackton1))

-## [v6](https://github.com/tj-actions/changed-files/tree/v6) (2021-05-26)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.3...v6)
-
 ## [v6.3](https://github.com/tj-actions/changed-files/tree/v6.3) (2021-05-26)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.2...v6.3)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6...v6.3)
+
+## [v6](https://github.com/tj-actions/changed-files/tree/v6) (2021-05-26)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.2...v6)

 **Merged pull requests:**

--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ jobs:
      # Example 1
      - name: Get changed files
        id: changed-files
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31

      - name: List all changed files
        run: |
@@ -80,7 +80,7 @@ jobs:
      # Example 2
      - name: Get changed files in the docs folder
        id: changed-files-specific
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          files: |
            docs/**
@@ -176,11 +176,11 @@ Support this project with a :star:

      - name: Get changed files using defaults
        id: changed-files
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31

      - name: Get changed files using a comma separator
        id: changed-files-comma
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          separator: ","

@@ -202,7 +202,7 @@ Support this project with a :star:

      - name: Get specific changed files
        id: changed-files-specific
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          files: |
            my-file.txt
@@ -243,14 +243,14 @@ Support this project with a :star:

      - name: Use a source file or list of file(s) to populate to files input.
        id: changed-files-specific-source-file
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          files_from_source_file: |
            test/changed-files-list.txt

      - name: Use a source file or list of file(s) to populate to files input and optionally specify more files.
        id: changed-files-specific-source-file-and-specify-files
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          files_from_source_file: |
            test/changed-files-list.txt
@@ -259,13 +259,13 @@ Support this project with a :star:

      - name: Use a different commit SHA
        id: changed-files-custom-sha
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          sha: ${{ github.event.pull_request.head.sha }}

      - name: Use a different base SHA
        id: changed-files-custom-base-sha
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          base_sha: ${{ github.event.pull_request.base.sha }}
          
@@ -277,7 +277,7 @@ Support this project with a :star:

      - name: Run changed-files with defaults on the dir1
        id: changed-files-for-dir1
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          path: dir1

@@ -289,13 +289,13 @@ Support this project with a :star:

      - name: Run changed-files using the last commit on the remote branch
        id: changed-files-since-last-remote-commit
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          since_last_remote_commit: "true"

      - name: Run changed-files with quotepath disabled
        id: changed-files-quotepath
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          quotepath: "false"
      
@@ -317,7 +317,7 @@ Support this project with a :star:

      - name: Run changed-files with the commit of the last successful test workflow run
        id: changed-files-base-sha-push
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          base_sha: ${{ steps.last_successful_commit_push.outputs.commit_hash }}

@@ -338,32 +338,32 @@ Support this project with a :star:
      - name: Run changed-files with the commit of the last successful test workflow run on main
        if: github.event_name == 'pull_request'
        id: changed-files-base-sha-pull-request
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          base_sha: ${{ steps.last_successful_commit_pull_request.outputs.commit_hash }}

      - name: Run changed-files with dir_names
        id: changed-files-dir-names
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          dir_names: "true"
      
      # All outputs are JSON formatted arrays and can be used in other actions and matrix compatible jobs.
      - name: Run changed-files with json output
        id: changed-files-json
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        wi
          json: "true"

      - name: Run changed-files since 2022-08-19
        id: changed-files-since
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          since: "2022-08-19"

      - name: Run changed-files until 2022-08-20
        id: changed-files-until
-        uses: tj-actions/changed-files@v30
+        uses: tj-actions/changed-files@v31
        with:
          until: "2022-08-20"
 ```
--- a/action.yml
+++ b/action.yml
@@ -158,6 +158,7 @@ runs:
      env:
        GITHUB_WORKSPACE: ${{ github.workspace }}
        GITHUB_EVENT_BEFORE: ${{ github.event.before }}
+        GITHUB_EVENT_FORCED : ${{ github.event.forced }}
        # INPUT_<VARIABLE_NAME> is not available in Composite run steps
        # https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#example-specifying-inputs
        INPUT_SINCE: ${{ inputs.since }}
@@ -190,6 +191,7 @@ runs:
        GITHUB_WORKSPACE: ${{ github.workspace }}
        GITHUB_PULL_REQUEST_BASE_SHA: ${{ github.event.pull_request.base.sha }}
        GITHUB_EVENT_BEFORE: ${{ github.event.before }}
+        GITHUB_EVENT_FORCED : ${{ github.event.forced }}
        # INPUT_<VARIABLE_NAME> is not available in Composite run steps
        # https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#example-specifying-inputs
        INPUT_SHA: ${{ steps.sha.outputs.sha }}
--- a/diff-sha.sh
+++ b/diff-sha.sh
@@ -62,10 +62,14 @@ if [[ -z $GITHUB_BASE_REF ]]; then
  CURRENT_BRANCH=$TARGET_BRANCH && exit_status=$? || exit_status=$?

  if [[ -z $INPUT_BASE_SHA ]]; then
-    PREVIOUS_SHA=$GITHUB_EVENT_BEFORE
+    git fetch --no-tags -u --progress origin --depth=2 "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
+    PREVIOUS_SHA=""
+
+    if [[ "$GITHUB_EVENT_FORCED" == "false" ]]; then
+      PREVIOUS_SHA=$GITHUB_EVENT_BEFORE
+    fi

    if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "0000000000000000000000000000000000000000" ]]; then
-      echo "::debug::First commit detected"
      PREVIOUS_SHA=$(git rev-parse "$(git branch -r --sort=-committerdate | head -1 | xargs)")
    fi

@@ -102,9 +106,11 @@ else
  echo "::debug::GITHUB_BASE_REF: $TARGET_BRANCH..."

  if [[ -z $INPUT_BASE_SHA ]]; then
+    git fetch --no-tags -u --progress origin --depth=1 "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
    PREVIOUS_SHA=$GITHUB_PULL_REQUEST_BASE_SHA && exit_status=$? || exit_status=$?
    echo "::debug::Previous SHA: $PREVIOUS_SHA"
  else
+    git fetch --no-tags -u --progress origin --depth=1 "$(git rev-parse --verify "$INPUT_BASE_SHA")" && exit_status=$? || exit_status=$?
    PREVIOUS_SHA=$INPUT_BASE_SHA
    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$?
    echo "::debug::Previous SHA: $PREVIOUS_SHA"
--- a/get-base-sha.sh
+++ b/get-base-sha.sh
@@ -22,10 +22,13 @@ if [[ -n "$INPUT_SINCE" ]]; then
 elif [[ -n "$INPUT_BASE_SHA" ]]; then
  echo "::set-output name=base_sha::$INPUT_BASE_SHA"
 elif [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "true" ]]; then
-  LAST_REMOTE_COMMIT="$GITHUB_EVENT_BEFORE"
+  LAST_REMOTE_COMMIT=""
+
+  if [[ "$GITHUB_EVENT_FORCED" == "false" ]]; then
+    LAST_REMOTE_COMMIT=$GITHUB_EVENT_BEFORE
+  fi

  if [[ -z "$LAST_REMOTE_COMMIT" || "$LAST_REMOTE_COMMIT" == "0000000000000000000000000000000000000000" ]]; then
-    echo "::debug::First commit detected"
    LAST_REMOTE_COMMIT=$(git rev-parse "$(git branch -r --sort=-committerdate | head -1 | xargs)")
  fi
  if [[ "$INPUT_SHA" == "$LAST_REMOTE_COMMIT" ]]; then
Author	SHA1	Message	Date
Tonye Jack	528984a4f8	Merge pull request #654 from tj-actions/chore/add-back-ability-to-fetch-branch-history	2022-09-28 20:49:21 -06:00
Tonye Jack	1b438493cf	chore: add back ability to fetch branch history	2022-09-28 20:42:32 -06:00
renovate[bot]	3b54ee8a34	chore(deps): update peter-evans/create-pull-request action to v4.1.3	2022-09-28 00:42:48 -06:00
Tonye Jack	ffddd5941d	Merge pull request #652 from tj-actions/upgrade-to-v31.0.1	2022-09-25 10:53:48 -06:00
jackton1	6313c343d4	Upgraded from v31.0.0 -> v31.0.1	2022-09-25 16:47:06 +00:00
Tonye Jack	75af1a47c4	Merge pull request #651 from tj-actions/fix/bug-with-forced-pushed-commits	2022-09-25 09:46:20 -06:00
Tonye Jack	b50afacfed	updated get-base-sha.sh	2022-09-25 09:31:57 -06:00
Tonye Jack	7de6088904	Updated check	2022-09-25 09:23:05 -06:00
Tonye Jack	8281b8ad57	fix: bug with force pushed commits	2022-09-25 09:19:22 -06:00
Tonye Jack	d82ceda8a1	Merge pull request #650 from tj-actions/upgrade-to-v31.0.0	2022-09-25 08:43:17 -06:00
jackton1	bff472661c	Upgraded from v30 -> v31.0.0	2022-09-25 08:01:32 +00:00