Skip to content

Conversation

@stephan57160
Copy link
Contributor

Pull Request Notice

Before sending a pull request make sure each commit solves one clear, minimal,
plausible problem. Further each commit should have the following format:

Problem: X is broken

Solution: do Y and Z to fix X

Please avoid sending a pull request with recursive merge nodes, as they
are impossible to fix once merged. Please rebase your branch on
zeromq/czmq master instead of merging it.

git remote add upstream [email protected]:zeromq/czmq.git
git fetch upstream
git rebase upstream/master
git push -f

In case you already merged instead of rebasing you can drop the merge commit.

git rebase -i HEAD~10

Now, find your merge commit and mark it as drop and save. Finally rebase!

If you are a new contributor please have a look at our contributing guidelines:
CONTRIBUTING.md

@stephan57160
Copy link
Contributor Author

Issues with libcurl4-nss-dev and clang-format-11.
I'll have a look tomorrow.

@bluca
Copy link
Member

bluca commented Jun 24, 2025

I have fixed the package builds, you need to fix the CI file here .github/workflows/CI.yaml and switch from libcurl4-nss-dev to libcurl4-gnutls-dev

@stephan57160
Copy link
Contributor Author

I have fixed the package builds, you need to fix the CI file here .github/workflows/CI.yaml and switch from libcurl4-nss-dev to libcurl4-gnutls-dev

Argh, I missed this comment...

Launched another Regen, to update:

  • libcurl4-gnutls-dev,
  • clang-format-18 instead of clang-format-11,
  • configure.ac.

@bluca
Copy link
Member

bluca commented Jun 25, 2025

Looks fine, if you undraft it can be merged. Also if you push the git release tags to your fork, the OBS tests will also run, for next time

@stephan57160 stephan57160 marked this pull request as ready for review June 25, 2025 11:45
@stephan57160
Copy link
Contributor Author

OK for the draft and the tags.

@bluca bluca merged commit 1786a2d into zeromq:master Jun 25, 2025
9 of 11 checks passed
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.

2 participants