Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/e2e-action-commit-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
uses: devops-infra/action-commit-push@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
commit_message: "[E2E] Basic commit test"
commit_message: "test(commit-push): basic commit test"
target_branch: test/e2e-commit-push-basic-${{ github.run_id }}

- name: Commit and push via docker image (preview)
Expand Down Expand Up @@ -122,8 +122,8 @@ jobs:
uses: devops-infra/action-commit-push@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
commit_prefix: "[E2E-PREFIX]"
commit_message: " Custom message test"
commit_prefix: "test(commit-push): "
commit_message: "custom message test"
target_branch: test/e2e-commit-push-prefix-${{ github.run_id }}

- name: Commit via docker image (preview)
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
allow_empty_commit: "true"
commit_message: "[E2E] Empty commit test"
commit_message: "test(commit-push): empty commit test"
target_branch: test/e2e-commit-push-empty-${{ github.run_id }}

- name: Empty commit via docker image (preview)
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
add_timestamp: "true"
commit_message: "[E2E] Timestamp branch test"
commit_message: "test(commit-push): timestamp branch test"
target_branch: test/e2e-commit-push-timestamp

- name: Commit via docker image (preview)
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
repository_path: repo
commit_message: "[E2E] Repository path test"
commit_message: "test(commit-push): repository path test"
target_branch: test/e2e-commit-push-path-${{ github.run_id }}

- name: Commit via docker image (preview)
Expand Down Expand Up @@ -318,13 +318,13 @@ jobs:
git checkout -b "${base_branch}"
echo "base" > e2e-reset-base.md
git add e2e-reset-base.md
git commit -m "[E2E] base branch for reset"
git commit -m "test(commit-push): base branch for reset"
git push origin "${base_branch}"

git checkout -b "${target_branch}" "${base_branch}"
echo "legacy" > e2e-reset-legacy.md
git add e2e-reset-legacy.md
git commit -m "[E2E] legacy target branch content"
git commit -m "test(commit-push): legacy target branch content"
git push origin "${target_branch}"

- name: Reset target branch using action
Expand Down Expand Up @@ -393,19 +393,19 @@ jobs:
git checkout -b "${base_branch}"
printf 'value=one\n' > e2e-rebase-conflict.md
git add e2e-rebase-conflict.md
git commit -m "[E2E] base commit"
git commit -m "test(commit-push): base commit"
git push origin "${base_branch}"

git checkout -b "${target_branch}" "${base_branch}"
printf 'value=target\n' > e2e-rebase-conflict.md
git add e2e-rebase-conflict.md
git commit -m "[E2E] target diverges"
git commit -m "test(commit-push): target diverges"
git push origin "${target_branch}"

git checkout "${base_branch}"
printf 'value=base\n' > e2e-rebase-conflict.md
git add e2e-rebase-conflict.md
git commit -m "[E2E] base diverges"
git commit -m "test(commit-push): base diverges"
git push origin "${base_branch}"

- name: Run action with strict rebase conflict handling
Expand Down Expand Up @@ -463,7 +463,7 @@ jobs:
git checkout -b test/e2e-commit-push-amend-${{ github.run_id }}
echo "v1" > e2e-amend-test.md
git add e2e-amend-test.md
git commit -m "E2E: initial commit for amend test"
git commit -m "test(commit-push): initial commit for amend test"
git push origin test/e2e-commit-push-amend-${{ github.run_id }}

- name: Add more content to file
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/e2e-action-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
git checkout -b test/e2e-pr-basic-${{ github.run_id }}
echo "E2E PR basic test $(date -u)" > e2e-pr-test.txt
git add e2e-pr-test.txt
git commit -m "[E2E] Basic PR test"
git commit -m "test(pull-request): basic PR test"
git push origin test/e2e-pr-basic-${{ github.run_id }}

- name: Create pull request
Expand All @@ -84,7 +84,7 @@ jobs:
uses: devops-infra/action-pull-request@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
title: "[E2E] Basic pull request test - safe to close"
title: "test(pull-request): basic pull request test - safe to close"
body: "Automated end-to-end test pull request. Will be closed automatically."
target_branch: master

Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
git checkout -b test/e2e-pr-custom-${{ github.run_id }}
echo "E2E PR custom title/body test $(date -u)" > e2e-pr-custom-test.txt
git add e2e-pr-custom-test.txt
git commit -m "[E2E] Custom title/body PR test"
git commit -m "test(pull-request): custom title/body PR test"
git push origin test/e2e-pr-custom-${{ github.run_id }}

- name: Create pull request with custom title and body
Expand All @@ -144,7 +144,7 @@ jobs:
uses: devops-infra/action-pull-request@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
title: "[E2E] Custom title test - safe to close"
title: "test(pull-request): custom title test - safe to close"
body: |
Automated end-to-end test.
Testing custom title and body fields.
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
git checkout -b test/e2e-pr-repo-path-${{ github.run_id }}
echo "E2E PR repository_path test $(date -u)" > e2e-pr-path-test.txt
git add e2e-pr-path-test.txt
git commit -m "[E2E] PR repository_path test"
git commit -m "test(pull-request): repository path PR test"
git push origin test/e2e-pr-repo-path-${{ github.run_id }}

- name: Create pull request with repository and repository_path
Expand All @@ -212,7 +212,7 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
repository: ${{ github.repository }}
repository_path: work/repo
title: "[E2E] Repository path PR test - safe to close"
title: "test(pull-request): repository path PR test - safe to close"
body: "Automated end-to-end test for repository_path input."
target_branch: master

Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
git checkout -b test/e2e-pr-draft-${{ github.run_id }}
echo "E2E draft PR test $(date -u)" > e2e-pr-draft-test.txt
git add e2e-pr-draft-test.txt
git commit -m "[E2E] Draft PR with diff test"
git commit -m "test(pull-request): draft PR with diff test"
git push origin test/e2e-pr-draft-${{ github.run_id }}

- name: Create draft pull request with diff injection
Expand All @@ -273,7 +273,7 @@ jobs:
uses: devops-infra/action-pull-request@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
title: "[E2E] Draft PR with diff - safe to close"
title: "test(pull-request): draft PR with diff - safe to close"
body: |
Automated end-to-end test.
<!-- Diff commits - START -->
Expand Down