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.

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

Orphaned generated code #4086

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Orphaned generated code #4086

merged 1 commit into from
Sep 3, 2024

Conversation

Azanul
Copy link
Collaborator

@Azanul Azanul commented Oct 3, 2023

Closes #3677

@ghost
Copy link

ghost commented Oct 3, 2023

Hey @Azanul, and thank you so much for making your first pull request in status-go! ❤️ Please help us make your experience better by filling out this brief questionnaire https://goo.gl/forms/uWqNcVpVz7OIopXg2

@igor-sirotin
Copy link
Collaborator

@Azanul thank you for your contribution and congrats on your first PR.
Sorry for the long review 😄

Please rebase to the latest develop branch to make all CI checks pass, and I'll merge it in.

@Azanul
Copy link
Collaborator Author

Azanul commented Aug 31, 2024

@igor-sirotin I think the branch is up to date

@igor-sirotin
Copy link
Collaborator

@igor-sirotin I think the branch is up to date

Your fork is 1282 commits behind latest develop in status-im/status-go.
image

Because of this (I think) CI checks are not running, there're something outdated.

@status-im-auto
Copy link
Member

status-im-auto commented Aug 31, 2024

Jenkins Builds

Commit #️⃣ Finished (UTC) Duration Platform Result
✖️ cc3f646 #1 2024-08-31 09:15:53 ~1 min tests 📄log
✔️ 933a750 #1 2024-09-03 18:22:29 ~2 min tests-rpc 📄log
✔️ 933a750 #1 2024-09-03 18:23:03 ~3 min linux 📦zip
✔️ 933a750 #1 2024-09-03 18:23:54 ~4 min ios 📦zip
✔️ 933a750 #1 2024-09-03 18:24:18 ~5 min android 📦aar
✔️ 933a750 #2 2024-09-03 18:52:50 ~32 min tests 📄log

@igor-sirotin
Copy link
Collaborator

@Azanul thanks for updating the fork, I can run all the checks now.
There will be an issue though.

  1. We require commit messages to follow Conventional Commits, but with _ for non-breaking changes.
    So in your case it should be something like

    fix_: Orphaned generated code
    
  2. We use git rebase strategy over merge strategy.
    So having a merge-commit cc3f646 won't work.
    GitHub might be smart enough to just drop it when merging the PR, but we still require Conventional Commits (look clause 1).

Until this is fixed, CI checks won't pass and, unfortunately, I'll not be able to merge 🙁


I suggest you to hard-reset your fork on top of latest develop and cherry-pick 07acd67 on top, while changing the commit message to fix_: Orphaned generated code.
OR use interactive rebase git feature, drop merge commit and rename your commit.

Sorry for such difficulties. But we do this do automatically calculate version/changes based on commit messages.

@igor-sirotin
Copy link
Collaborator

@jakubgs how do we work with forks? For such PR, should I start each check manually on Jenkins?
I started tests manually, but I expected it to happen automatically 🤔

@Azanul
Copy link
Collaborator Author

Azanul commented Aug 31, 2024

@igor-sirotin Check it out. I rebased, soft reset and re-commit with updated message

@igor-sirotin
Copy link
Collaborator

@igor-sirotin Check it out. I rebased, soft reset and re-commit with updated message

Thank you. I'll figure out what's happening with fork jenkins checks and come back to you.

@jakubgs
Copy link
Member

jakubgs commented Sep 3, 2024

Sorry, our permissions model for Jenkins CI only allows jobs to be started for contributors. I've added you to the repo:

image

Once you accept the invite and you push again to this branch jobs should start.

Signed-off-by: Azanul <azanulhaque@gmail.com>
@Azanul
Copy link
Collaborator Author

Azanul commented Sep 3, 2024

Sorry, our permissions model for Jenkins CI only allows jobs to be started for contributors. I've added you to the repo:

image

Once you accept the invite and you push again to this branch jobs should start.

I did accept and pushed but nothing happend

@igor-sirotin
Copy link
Collaborator

I did accept and pushed but nothing happend

Don't worry, everything that should have happened, happened 👍

image

Thank you for your contribution!

@igor-sirotin igor-sirotin requested review from Samyoul and removed request for Samyoul September 3, 2024 20:31
@igor-sirotin igor-sirotin merged commit 3ca2d6e into status-im:develop Sep 3, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Orphaned Encryption Protobuf
4 participants