actions icon indicating copy to clipboard operation
actions copied to clipboard

Add body override capability

Open techno-sam opened this issue 3 years ago • 23 comments

Added a body tag to allow replacing the changelog with a custom body. This should resolve issue #19.

techno-sam avatar Apr 09 '21 00:04 techno-sam

Thanks for taking the time to write this up! Could you also add tests to validate both sides of the optional body argument? (i.e. behaves correctly with a body provided, and also without a body provided) - look at the implemented tests for examples.

Will probably have to update the documentation as well (with examples).

I'll look through this more thoroughly in few days :+1:

marvinpinto avatar Apr 09 '21 12:04 marvinpinto

Working on test, not complete yet.

techno-sam avatar Apr 10 '21 00:04 techno-sam

Tests and main functionality complete, working on documentation.

techno-sam avatar Apr 10 '21 18:04 techno-sam

Documentation complete, I leave it up to @marvinpinto to decide exactly how he wants to implement the example.

techno-sam avatar Apr 10 '21 19:04 techno-sam

Could you squash all these commits into a single commit, and also use the commitlint guidelines? I am not sure why commitlint is not failing but it should. Also enable the checkbox to allow the repo maintainer to add commits (if you haven't already). I'll hopefully have a look at it this week and make any changes I need.

Thanks again!

marvinpinto avatar Apr 14 '21 13:04 marvinpinto

Squashed and commitlint-compatible.

techno-sam avatar Apr 16 '21 15:04 techno-sam

Hmm, it looks like your squashing possibly brought in a whole bunch of other changes - to dependencies as well as the lock file? If you need to get your branch updated, you can rebase the changes onto your branch. But as is I will not merge this. I manage lock file and dependency updates myself.

I was asking you to only squash your changes down to a single commit so that I can take over and add my tweaks. This way you also get "credit" for it. Let me know if you're still up for doing this!

marvinpinto avatar Apr 16 '21 16:04 marvinpinto

Ok, I will do this.

techno-sam avatar Apr 16 '21 16:04 techno-sam

I removed your changes, squashed down to single commit, should be good now.

techno-sam avatar Apr 16 '21 16:04 techno-sam

I think you might have made a mistake while squashing, all your code changes appear to be gone? (see the Files Changed section of this PR)

marvinpinto avatar Apr 16 '21 18:04 marvinpinto

Yeah, I have to see what happened there.

techno-sam avatar Apr 16 '21 19:04 techno-sam

I think this should finally be it. I apologize for the time it has taken me, I am new to github, and didn't squash right the first time.

techno-sam avatar Apr 16 '21 19:04 techno-sam

It looks like it is back to this state https://github.com/marvinpinto/actions/pull/124#issuecomment-821277533

As I said no worries if this is getting too much 👍🏾

marvinpinto avatar Apr 16 '21 19:04 marvinpinto

I just made sure it was up to date with your master, is this not good? I also enjoy the experience this is giving me, so don't worry.

techno-sam avatar Apr 16 '21 19:04 techno-sam

@marvinpinto @techno-sam Is there an update for this? I don't mind taking it over if needed.

philtrep avatar Jun 08 '21 19:06 philtrep

I need someone to take this over, I can't figure it out anymore.

techno-sam avatar Jun 12 '21 19:06 techno-sam

I need someone to take this over, I can't figure it out anymore.

You were so close though ;)

Rollback your commit to changes:

git reset --soft HEAD~1

Check the status of the commit, i.e. what files you are adding to it:

git status

There'll be a lot of files you probably don't want to commit. It says to unstage files you use git restore --staged <file>

So:

git restore --staged yarn.lock
git restore --staged .github/*

etc etc until what remains is only the files you edited.

Then git commit and give it a message again.

Now you have a repository full of unwanted changes for some reason.

To get rid of them use:

git reset --hard HEAD

Now we have a clean repo, so now we need to rebase it off the latest origin.

git fetch origin/master
git rebase origin/master

If you get a merge conflict, then resolve it following the instructions.

Then force push your repository up.

russkel avatar Jul 13 '21 07:07 russkel

Big +1 on this feature as well!

kian2attari avatar Jul 15 '21 21:07 kian2attari

Hello, can someone push it please? For big rebases we having often issues with https://github.com/marvinpinto/actions/issues/255

Thank you! :+1:

okias avatar Aug 09 '21 18:08 okias

I think this should now finally be good, big thanks to @russkel's comment.

techno-sam avatar Aug 28 '21 15:08 techno-sam

That's the way! :+1:

russkel avatar Aug 28 '21 15:08 russkel

but we still need it for rebasing on the linux-next branch

okias avatar Sep 03 '21 07:09 okias

Can this be merged, please?

We still seeing very often Error: API rate limit exceeded for installation ID .... since rebasing on linux-next generate very long changelog.

okias avatar Sep 18 '21 08:09 okias