Skip to content

CONTRIBUTING: add more hints on what is required to cut a release#1989

Merged
xrmx merged 2 commits intomainfrom
xrmx-patch-1
Mar 22, 2024
Merged

CONTRIBUTING: add more hints on what is required to cut a release#1989
xrmx merged 2 commits intomainfrom
xrmx-patch-1

Conversation

@xrmx
Copy link
Copy Markdown
Member

@xrmx xrmx commented Mar 6, 2024 •
edited
Loading

What does this pull request do?

Add more hints on how to release a new version of the agent

Related issues

Closes #1991

@github-actions github-actions bot added agent-python community Issues opened by the community triage Issues awaiting triage labels Mar 6, 2024
xrmx
xrmx commented Mar 6, 2024
View reviewed changes
Copy link
Copy Markdown
Member Author

@xrmx xrmx left a comment

Choose a reason for hiding this comment

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

Need more hints

https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key

@xrmx xrmx marked this pull request as draft March 6, 2024 17:04
@xrmx
Copy link
Copy Markdown
Member Author

xrmx commented Mar 6, 2024 •
edited
Loading

One also needs to have some cautions when cloning:

ERROR: The 'elastic' organization has enabled or enforced SAML SSO.
To access this repository, you must use the HTTPS remote with a personal access token or SSH with an SSH key and passphrase that has been authorized for this organization.
Visit https://docs.github.com/articles/authenticating-to-a-github-organization-with-saml-single-sign-on/ for more information.

@xrmx
Copy link
Copy Markdown
Member Author

xrmx commented Mar 6, 2024

Cannot push to 6.x branch because it's protected:

$ git push upstream 6.x
0 oggetti totali (0 delta), 0 riutilizzati (0 delta), 0 riutilizzati nel file pack
remote: error: GH006: Protected branch update failed for refs/heads/6.x.
remote: error: 3 of 4 required status checks have not succeeded: 2 expected and 1 failing.
To github.com:elastic/apm-agent-python.git
 ! [remote rejected]   6.x -> 6.x (protected branch hook declined)

@xrmx xrmx changed the title CONTRIBUTING: warn to have a PGP key around for releasing CONTRIBUTING: add more hints on what is required to cut a release Mar 7, 2024
@xrmx xrmx marked this pull request as ready for review March 7, 2024 09:12
@xrmx xrmx mentioned this pull request Mar 7, 2024
Closed
xrmx
xrmx commented Mar 11, 2024
View reviewed changes
@xrmx xrmx marked this pull request as draft March 11, 2024 16:48
@xrmx xrmx force-pushed the xrmx-patch-1 branch 2 times, most recently from 9f8967d to 58dbac2 Compare March 20, 2024 14:07
@xrmx xrmx marked this pull request as ready for review March 20, 2024 14:07
@xrmx xrmx requested a review from basepi March 20, 2024 14:07
@xrmx
Copy link
Copy Markdown
Member Author

xrmx commented Mar 20, 2024

Updated after the discussion

basepi
basepi approved these changes Mar 22, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@basepi basepi left a comment

Choose a reason for hiding this comment

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

This looks great!

@xrmx xrmx merged commit db40292 into main Mar 22, 2024
@xrmx xrmx deleted the xrmx-patch-1 branch March 22, 2024 18:37
xrmx added a commit to xrmx/apm-agent-python that referenced this pull request Apr 3, 2024
@xrmx
CONTRIBUTING: add more hints on what is required to cut a release (el…
f692089 
…astic#1989)

* CONTRIBUTING: open PRs to the main branch

* CONTRIBUTING: add more hints on what you need to setup for releasing

Fixes elastic#1991
xrmx added a commit that referenced this pull request Apr 4, 2024
@xrmx
CONTRIBUTING: add more hints on what is required to cut a release (#1989
cfc6a24 
)

* CONTRIBUTING: open PRs to the main branch

* CONTRIBUTING: add more hints on what you need to setup for releasing

Fixes #1991
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@basepi basepi basepi approved these changes

Assignees

@basepi basepi

Labels

agent-python community Issues opened by the community triage Issues awaiting triage

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Improve release docs in CONTRIBUTING

2 participants

@xrmx @basepi