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

Allow Editing Release-Please PR without Force Push #1058

Open
jakeyheath opened this issue Nov 21, 2024 · 0 comments
Open

Allow Editing Release-Please PR without Force Push #1058

jakeyheath opened this issue Nov 21, 2024 · 0 comments
Labels
priority: p3 Desirable enhancement or fix. May not be included in next release. type: question Request for information or clarification. Not an issue.

Comments

@jakeyheath
Copy link

jakeyheath commented Nov 21, 2024

Hi there,
We use release-please PRs to aggregate our CHANGELOG, but also as the branch that we deploy staging from. We have some Github Actions that only run on the release-please branch and it will update some of the files in the branch accordingly and run some tests. We've noticed this problem where these files that get updated will get reverted during a "force-push" when a new PR is merged with main. Instead of preserving these changes, the force-push reverts the state of the PR to the latest set of changes made to the CHNAGELOG and corresponding plugin files. Is there a way to configure this force-push behavior and instead configure a merge strategy so we can keep the changes that were already triggered by our actions?

Here is how we trigger release-please:

on:
  push:
    branches:
      - main
concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true
name: release-please
jobs:
  release-please:
    steps:
      - name: Generate token
        id: generate_token
        uses: tibdex/github-app-token@v2
        with:
          app_id: ${{ secrets.APP_ID }}
          private_key: ${{ secrets.PK }}

      - name: release please
        uses: googleapis/release-please-action@v4
        id: release
        with:
          token: ${{ steps.generate_token.outputs.token }}

Here's our release-please-config.json

{
  "release-type": "simple",
  "pull-request-title-pattern": "chore${scope}: release${component} ${version}",
  "bump-minor-pre-major": true,
  "changelog-sections": [
    {
      "type": "chore",
      "section": "Misc",
      "hidden": false
    },
    {
      "type": "feat",
      "section": "Features",
      "hidden": false
    },
    {
      "type": "fix",
      "section": "Bug Fixes",
      "hidden": false
    },
    {
      "type": "deps",
      "section": "Dependencies",
      "hidden": false
    },
    {
      "type": "revert",
      "section": "Reverts",
      "hidden": false
    },
    {
      "type": "docs",
      "section": "Documentation",
      "hidden": false
    },
    {
      "type": "style",
      "section": "Styles",
      "hidden": false
    },
    {
      "type": "test",
      "section": "Tests",
      "hidden": false
    },
    {
      "type": "ci",
      "section": "Continuous Integration",
      "hidden": false
    },
    {
      "type": "perf",
      "section": "Performance Improvements",
      "hidden": false
    },
    {
      "type": "refactor",
      "section": "Code Refactoring",
      "hidden": false
    }
  ],
  "packages": {
    "entity_registry": {
      "package-name": "entity_registry"
    }
  }
}
@jakeyheath jakeyheath added priority: p3 Desirable enhancement or fix. May not be included in next release. type: question Request for information or clarification. Not an issue. labels Nov 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: p3 Desirable enhancement or fix. May not be included in next release. type: question Request for information or clarification. Not an issue.
Projects
None yet
Development

No branches or pull requests

1 participant