Skip to content

Fix GH Actions Windows CI: switch from pkgconf to pkg-config #4059

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

Merged
merged 1 commit into from
Oct 6, 2022

Conversation

amesgen
Copy link
Member

@amesgen amesgen commented Oct 6, 2022

Description

This fixes this CI error that has appeared recently.

MSYS2 recently updated (msys2/MINGW-packages#13257) its version of pkgconf, which is an alternative implementation of the "classic" pkg-config, with both providing the pkg-config binary. It seems that this does no longer work correctly (concretely, pkg-config --modversion pkg1 pkg2 pkg3 ... is supposed to output the version numbers for all arguments, but pkgconf returns at most two versions).

To fix this, I removed cmake (as it requires pkgconf), and we now install pkg-config manually, as putting it in the install block above causes it to be silently elided, as the mingw-w64-x86_64-toolchain group contains pkgconf.

Checklist

  • Branch
    • Commit sequence broadly makes sense
    • Commits have useful messages
    • New tests are added if needed and existing tests are updated
    • If this branch changes Consensus and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If this branch changes Network and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If serialization changes, user-facing consequences (e.g. replay from genesis) are confirmed to be intentional.
  • Pull Request
    • Self-reviewed the diff
    • Useful pull request description at least containing the following information:
      • What does this PR change?
      • Why these changes were needed?
      • How does this affect downstream repositories and/or end-users?
      • Which ticket does this PR close (if any)? If it does, is it linked?
    • Reviewer requested

@dnadales
Copy link
Member

dnadales commented Oct 6, 2022

bors r+

@amesgen
Copy link
Member Author

amesgen commented Oct 6, 2022

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Oct 6, 2022

Already running a review

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Oct 6, 2022

@iohk-bors iohk-bors bot merged commit a856163 into master Oct 6, 2022
@iohk-bors iohk-bors bot deleted the amesgen/libsodium-pkgconfig branch October 6, 2022 09:41
iohk-bors bot added a commit to IntersectMBO/cardano-node that referenced this pull request Oct 11, 2022
4513: Fix Windows Github Actions Workflow for building Haskell r=newhoggy a=newhoggy

Inspired by IntersectMBO/ouroboros-network#4059

Thanks `@amesgen` !

Co-authored-by: John Ky <[email protected]>
iohk-bors bot added a commit to IntersectMBO/cardano-node that referenced this pull request Oct 11, 2022
4513: Fix Windows Github Actions Workflow for building Haskell r=newhoggy a=newhoggy

Inspired by IntersectMBO/ouroboros-network#4059

Thanks `@amesgen` !

Co-authored-by: John Ky <[email protected]>
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.

3 participants