Sitelet https://github.com/nextcloud/.github/issues/28
Skip to content

Add posibility to ignore build assets on rebase command #28

Description

@juliusknorr

When trying to rebase a PR with committed js bundles it would be great if one could easily tell that those should be ignored during the rebase as a compile command would fix the conflict afterwards.

Activity

  1. juliusknorr commented on Dec 2, 2021

    @juliusknorr
    MemberAuthor
  2. Pytal commented on Dec 2, 2021

    @Pytal
    Member
  3. max-nextcloud commented on Jan 13, 2022

    @max-nextcloud
    Contributor

    https://github.com/cirrus-actions/rebase/blob/master/entrypoint.sh#L100 is where the handling would need to take palce

    I don't think we even get to that point. I think the rebase action that we are using errs out when it github says the commit is not rebaseable:
    https://github.com/cirrus-actions/rebase/blob/master/entrypoint.sh#L45

  4. max-nextcloud commented on Jan 13, 2022

    @max-nextcloud
    Contributor

    I don't know if jobs can be combined like that but we could:

    1. git checkout HEAD~ js && git commit --amend js --no-edit
    2. /rebase
    3. /compile amend /

    First line only works for a single commit though. We could apply it to all commits with git filter branch or a rebase --exec...
    But frankly this sounds fairly complicated and like we were asking for trouble.

    The first could be defined as a uncommit command.

    1. /uncommit js
    2. /rebase
    3. /compile amend /

    However all of these will still require ci runs - even though we know ci will fail on 1 and 2 because of lack of compiled js.

  5. MichaIng commented on Jan 13, 2022

    @MichaIng
    Member

    Probably it's possible to somehow set a flag to 1 an 2 to prevent CI?

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    enhancementNew feature or request

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions