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

Make backporting action use PRs to support protected branches [DOC-268] #1396

Merged
merged 5 commits into from
Dec 2, 2024

Conversation

JackPGreen
Copy link
Contributor

@JackPGreen JackPGreen commented Nov 22, 2024

In DOC-255, branch protection was added - preventing direct pushes.

Instead, the backport workflow should create PRs to backport the changes. This gives the possibility for pre-merge checks to be run (i.e. preventing introducing dead links etc).

Leverages existing backport tool, but exposed some issues which need to be addressed before this can be merged:

Tested in a test repo, where a dummy PR was successfully backported. However, due to the complexity of fork-triggering, it wil need to be re-tested once merged.

Fixes: DOC-268

In [DOC-255](https://hazelcast.atlassian.net/browse/DOC-255), branch protection was added - preventing direct `push`es.

Instead, the backport workflow should create PRs to backport the changes. This gives the _possibility_ for pre-merge checks to be run (i.e. preventing introducing dead links etc).

Leverages [_existing_ `backport` tool](https://github.com/hazelcast/backport), but exposed some issues which need to be addressed *before this can be merged*:
- T
- B
- C

Tested in a [test repo](https://github.com/JackPGreen2/hz-docs), where a [dummy PR](JackPGreen2#5) was [successfully backported](JackPGreen2#16). However, due to the complexity of fork-triggering, it wil need to be re-tested once merged.

Fixes: [DOC-268](https://hazelcast.atlassian.net/browse/DOC-268)
@JackPGreen JackPGreen self-assigned this Nov 22, 2024
Copy link

netlify bot commented Nov 22, 2024

Deploy Preview for hardcore-allen-f5257d ready!

Name Link
🔨 Latest commit bf8b703
🔍 Latest deploy log https://app.netlify.com/sites/hardcore-allen-f5257d/deploys/6746009fd2884800087cdcfc
😎 Deploy Preview https://deploy-preview-1396--hardcore-allen-f5257d.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@JackPGreen JackPGreen marked this pull request as ready for review November 22, 2024 12:06
@JackPGreen JackPGreen requested a review from a team as a code owner November 22, 2024 12:06
.github/workflows/backport-workflow.yml Outdated Show resolved Hide resolved
.github/workflows/backport-workflow.yml Outdated Show resolved Hide resolved
.github/workflows/backport-workflow.yml Outdated Show resolved Hide resolved
.github/workflows/backport-workflow.yml Outdated Show resolved Hide resolved
JackPGreen added a commit to hazelcast/backport that referenced this pull request Nov 27, 2024
To support `backport` being used in multiple GitHub Actions:
- hazelcast/hazelcast-mono#3642
- hazelcast/hz-docs#1396

A composite GitHub Action has been created to centralise it's usage, to
make callers simpler.

Implementation is a sliced from `hazelcast-mono`, with some parameters
now explicit inputs.

Tested via [dummy PR](JackPGreen2/hz-docs#14) in
[test repo](https://github.com/JackPGreen2/hz-docs) that [backported
successfully](https://github.com/JackPGreen2/hz-docs/actions/runs/12029584772/job/33536129458)
(via JackPGreen2/hz-docs#26).
@JackPGreen JackPGreen enabled auto-merge (squash) November 27, 2024 14:26
@JackPGreen
Copy link
Contributor Author

@hazelcast/documentation is anyone able to review, please?

@JackPGreen JackPGreen merged commit 3f627f4 into hazelcast:main Dec 2, 2024
6 checks passed
@JackPGreen JackPGreen deleted the DOC-268 branch December 2, 2024 09:23
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.

3 participants