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

gitea: update to 1.16.1 #35466

Closed
wants to merge 1 commit into from
Closed

gitea: update to 1.16.1 #35466

wants to merge 1 commit into from

Conversation

zen0bit
Copy link
Contributor

@zen0bit zen0bit commented Feb 8, 2022

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, x86_64 libc

@zen0bit zen0bit mentioned this pull request Feb 8, 2022
@paper42
Copy link
Member

paper42 commented Feb 14, 2022

Please rebase on top of master to make CI run

@catdevnull
Copy link
Contributor

@zen0bit Something like this:

# Fetch latest changes from upstream
git fetch upstream
# Rebase on top of master
git rebase upstream/master

You might need to add the upstream remote:

git remote add upstream https://github.com/void-linux/void-packages

@catdevnull
Copy link
Contributor

It seems you got merge commits still. Try this:

# Fetch latest changes from upstream
git fetch upstream
# Reset branch to upstream
git reset --hard upstream/master
# Add the upgrade commit on top
git cherry-pick 1512578282a22c0c82d32964c117e7f7a82a50e0
# Force push
git push --force

Also, you still haven't replaced the hardcoded version in distfiles. After the previous commands, you could do this:

# Do the changes with your favourite editor
# Add the changes to the last commit ("amending")
git commit srcpkgs/gitea/template --amend
# Force push
git push --force

@catdevnull
Copy link
Contributor

This looks great, @paper42?

@paper42 paper42 closed this in 7e85855 Feb 23, 2022
@zen0bit zen0bit deleted the test branch February 24, 2022 01:10
algor512 pushed a commit to algor512/void-packages that referenced this pull request Mar 13, 2022
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.

None yet

3 participants