Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Add git config to rebase code #1634

Merged
merged 1 commit into from
Dec 21, 2023
Merged

ci: Add git config to rebase code #1634

merged 1 commit into from
Dec 21, 2023

Conversation

stevenhorsman
Copy link
Member

  • Try using dummy details in git config to avoid:
Committer identity unknown
...
fatal: empty ident name

error

@stevenhorsman
ci: Add git config to rebase code
0a6135d 
- Try using dummy details in git config to avoid:
```
Committer identity unknown
...
fatal: empty ident name
```
error

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
@stevenhorsman
Copy link
Member Author

This PR is 1 commit behind main, to hopefully we can use it to test the rebase logic

@stevenhorsman stevenhorsman added the test_e2e_libvirt Run Libvirt e2e tests label Dec 20, 2023
@stevenhorsman
Copy link
Member Author

The rebase logic is working here: https://github.com/confidential-containers/cloud-api-adaptor/actions/runs/7274126309/job/19819418169?pr=1634

Run ./hack/ci-helper.sh rebase-atop-of-the-latest-target-branch
  ./hack/ci-helper.sh rebase-atop-of-the-latest-target-branch
  shell: /usr/bin/bash -e {0}
Adding user name and email to the local git repo
Rebasing atop of the latest main
Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.

@stevenhorsman stevenhorsman linked an issue Dec 20, 2023 that may be closed by this pull request
ci: rebase logic failing #1633
Closed
@liudalibj liudalibj mentioned this pull request Dec 21, 2023
Merged
liudalibj
liudalibj approved these changes Dec 21, 2023
View reviewed changes
Copy link
Member

@liudalibj liudalibj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
thanks @stevenhorsman

@liudalibj liudalibj merged commit 02662fe into confidential-containers:main Dec 21, 2023
27 checks passed
@stevenhorsman stevenhorsman deleted the git-config branch March 11, 2024 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkulke mkulke mkulke approved these changes

@liudalibj liudalibj liudalibj approved these changes

@bpradipt bpradipt Awaiting requested review from bpradipt

@huoqifeng huoqifeng Awaiting requested review from huoqifeng

Assignees
No one assigned
Labels
test_e2e_libvirt Run Libvirt e2e tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ci: rebase logic failing
3 participants
@stevenhorsman @mkulke @liudalibj