-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7f4bdab
commit 9f3da19
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,7 +103,7 @@ if [[ -n ${VERBOSE-} ]]; then | |
| echo "Merge Instance Depth= ${merge_instance_depth}" | ||
|
|
||
| git checkout -q "${MERGE_INSTANCE_BRANCH_HEAD_SHA}" | ||
| git clean -dfx -f --exclude=".trunk" --exclude="tests" --exclude="local-action" . | ||
| git clean -dfx -f --exclude=".trunk" --exclude="local-action" . | ||
| git submodule update --recursive | ||
| git log -n "${merge_instance_depth}" --oneline | cat | ||
|
|
||
|
|
@@ -112,7 +112,7 @@ if [[ -n ${VERBOSE-} ]]; then | |
| echo "PR Depth= ${pr_depth}" | ||
|
|
||
| git checkout -q "${original_branch}" | ||
| git clean -dfx -f --exclude=".trunk" --exclude="tests" --exclude="local-action" . | ||
| git clean -dfx -f --exclude=".trunk" --exclude="local-action" . | ||
| git submodule update --recursive | ||
| git log -n "${pr_depth}" --oneline | cat | ||
| fi | ||
|
|
@@ -137,7 +137,7 @@ else | |
| fi | ||
| logIfVerbose "Hashes for upstream don't exist in cache, changing branch and computing..." | ||
| git checkout -q "${MERGE_INSTANCE_BRANCH_HEAD_SHA}" | ||
| git clean -dfx -f --exclude=".trunk" --exclude="tests" --exclude="bazel-diff.jar" --exclude="user.bazelrc" --exclude="local-action" . | ||
| git clean -dfx -f --exclude=".trunk" --exclude="bazel-diff.jar" --exclude="user.bazelrc" --exclude="local-action" . | ||
| git submodule update --recursive | ||
| generate_hashes "${merge_instance_branch_out}" | ||
| try_checkout_head | ||
|
|
@@ -149,14 +149,14 @@ if [[ -e ${merge_instance_with_pr_branch_out} ]]; then | |
| else | ||
| logIfVerbose "Hashes for merge result don't exist in cache, merging and computing..." | ||
| git -c "user.name=Trunk Actions" -c "[email protected]" merge --squash "${original_branch}" | ||
| git clean -dfx -f --exclude=".trunk" --exclude="tests" --exclude="bazel-diff.jar" --exclude="${MERGE_INSTANCE_BRANCH_HEAD_SHA}" --exclude="bazel-*" --exclude="user.bazelrc" --exclude="local-action" . | ||
| git clean -dfx -f --exclude=".trunk" --exclude="bazel-diff.jar" --exclude="${MERGE_INSTANCE_BRANCH_HEAD_SHA}" --exclude="bazel-*" --exclude="user.bazelrc" --exclude="local-action" . | ||
| git submodule update --recursive | ||
| generate_hashes "${merge_instance_with_pr_branch_out}" | ||
| fi | ||
|
|
||
| # Reset back to the original branch | ||
| git checkout -q "${original_branch}" | ||
| git clean -dfx -f --exclude=".trunk" --exclude="tests" --exclude="bazel-diff.jar" --exclude="${MERGE_INSTANCE_BRANCH_HEAD_SHA}" --exclude="${PR_BRANCH_HEAD_SHA}_${MERGE_INSTANCE_BRANCH_HEAD_SHA}" --exclude="user.bazelrc" --exclude="bazel-*" --exclude="local-action" . | ||
| git clean -dfx -f --exclude=".trunk" --exclude="bazel-diff.jar" --exclude="${MERGE_INSTANCE_BRANCH_HEAD_SHA}" --exclude="${PR_BRANCH_HEAD_SHA}_${MERGE_INSTANCE_BRANCH_HEAD_SHA}" --exclude="user.bazelrc" --exclude="bazel-*" --exclude="local-action" . | ||
| git submodule update --recursive | ||
|
|
||
| # Compute impacted targets | ||
|
|
||