Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add posibility to ignore build assets on rebase command #28

Open
juliusknorr opened this issue Dec 2, 2021 · 5 comments
Open

Add posibility to ignore build assets on rebase command #28

juliusknorr opened this issue Dec 2, 2021 · 5 comments
Labels
enhancement New feature or request

Comments

@juliusknorr
Copy link
Member

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.

@juliusknorr juliusknorr added the enhancement New feature or request label Dec 2, 2021
@juliusknorr
Copy link
Member Author

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

@Pytal
Copy link
Member

Pytal commented Dec 2, 2021

Would be superseded by https://github.com/orgs/nextcloud/projects/47#card-65665432

@max-nextcloud
Copy link
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

@max-nextcloud
Copy link
Contributor

max-nextcloud commented Jan 13, 2022

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.

@MichaIng
Copy link
Member

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

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

4 participants