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

mesa: update to 23.1.1. #44108

Closed
wants to merge 0 commits into from
Closed

Conversation

SpidFightFR
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, (x64-GlibC)

Thanks to Aedinius on the IRC for helping with this PR !

Copy link
Member

@classabbyamp classabbyamp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the consul changes should not be there, it's reversing a change that was made even.

use git pull --rebase to update your branch in the future

@SpidFightFR
Copy link
Contributor Author

SpidFightFR commented May 27, 2023

@classabbyamp i get an error with the updated commit of consul:

=> ERROR: mesa-23.1.1_1: do-patch_00-patches: 'patch -s ${_args} < "${_patch}" 2> /dev/null' exited with 1
=> ERROR:   in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR:   in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:262
=> ERROR:   in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33

@classabbyamp
Copy link
Member

You probably need to ./xbps-src clean

@SpidFightFR
Copy link
Contributor Author

Yep, it works, i'm gonna let it build nicely, once that's done, gonna check if there are any mistakes in the template and update the PR. See ya then, and thanks for your help !

@SpidFightFR
Copy link
Contributor Author

Okay so this update of my branch says "3 files changed", probably because i firstly changed consul, but in reality i pulled the latest commits from the void repos and added back my changes with mesa. It should be okay, but please keep me in touch.

@SpidFightFR SpidFightFR changed the title mesa: update to 23.1.1. (+ required consul update) mesa: update to 23.1.1. May 27, 2023
@abenson
Copy link
Contributor

abenson commented May 27, 2023

Something went wrong with your commit... It shows the wrong author.

Follow @classabbyamp's recommendation, run git pull --rebase and then git commit --amend --reset-author.

@SpidFightFR
Copy link
Contributor Author

Something went wrong with your commit... It shows the wrong author.

Follow @classabbyamp's recommendation, run git pull --rebase and then git commit --amend --reset-author.

okay i ran both of the commands, i hope this time it will be good !

@classabbyamp
Copy link
Member

There are still changes to the consul template included here that shouldn't be

@SpidFightFR SpidFightFR deleted the update_mesa branch May 29, 2023 18:02
@SpidFightFR SpidFightFR restored the update_mesa branch May 29, 2023 18:02
@SpidFightFR SpidFightFR deleted the update_mesa branch May 29, 2023 18:03
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