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

chore: add git commit hash to external logger #2731

Merged

Conversation

AndroidBob
Copy link
Collaborator

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:
kalium


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

Issues

Briefly describe the issue you have solved or implemented with this pull request. If the PR contains multiple issues, use a bullet list.

Causes (Optional)

Briefly describe the causes behind the issues. This could be helpful to understand the adopted solutions behind some nasty bugs or complex issues.

Solutions

Briefly describe the solutions you have implemented for the issues explained above.

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

Needs releases with:

  • GitHub link to other pull request

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)


PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. .

@AndroidBob AndroidBob added the cherry-pick PR is cherry-picking changes from another banch label Feb 22, 2024
Copy link
Contributor

github-actions bot commented Feb 22, 2024

Test Results

878 tests  ±0   878 ✅ ±0   15m 18s ⏱️ + 3m 2s
120 suites ±0     0 💤 ±0 
120 files   ±0     0 ❌ ±0 

Results for commit c74df9f. ± Comparison against base commit bee00f0.

♻️ This comment has been updated with latest results.

Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator Author

Build 3274 succeeded.

The build produced the following APK's:

@AndroidBob
Copy link
Collaborator Author

Build 3460 failed.

…hash-to-external-logger-cherry-pick

# Conflicts:
#	kalium
Copy link
Contributor

@AndroidBob looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop This PR
4be820aa2bb05ffc40a8ec1709660b16cbe6bfdd 91a09ffd30ca372196420b1ef650c71d2e09fdef

Is this intentional?

@MohamadJaara MohamadJaara enabled auto-merge March 21, 2024 15:08
@MohamadJaara MohamadJaara added this pull request to the merge queue Mar 21, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 21, 2024
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator Author

Build 3683 succeeded.

The build produced the following APK's:

@MohamadJaara MohamadJaara enabled auto-merge March 22, 2024 13:15
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator Author

Build 3703 succeeded.

The build produced the following APK's:

@yamilmedina yamilmedina disabled auto-merge March 28, 2024 11:41
Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@yamilmedina yamilmedina enabled auto-merge March 28, 2024 12:27
@yamilmedina yamilmedina added this pull request to the merge queue Mar 28, 2024
@AndroidBob
Copy link
Collaborator Author

Build 3830 failed.

Merged via the queue into develop with commit 7898006 Mar 28, 2024
13 of 14 checks passed
@yamilmedina yamilmedina deleted the chore/add-commit-shash-to-external-logger-cherry-pick branch March 28, 2024 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants