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

Merge 7.5 hotfixes #4311

Merged
merged 4 commits into from
Aug 7, 2023
Merged

Merge 7.5 hotfixes #4311

merged 4 commits into from
Aug 7, 2023

Commits on Aug 4, 2023

  1. requirements: bump craft-archives

    Version 1.1.3 fixes the issue with package-repositories that declare
    architectures. In addition to addressing the wrong parameter order, the
    new version also improves the handling of architectures.
    
    The summary of the change is: if the host system is amd64 and the arch
    of the package repository is i386, _or_ if the host is arm64 and the
    repo armhf, then `dpkg --add-architecture <repo_arch>` will be called.
    Otherwise, the command is not called. This lets us preserve the
    behavior of enabling i386 in the official repositories when a repo
    using i386 is added, with the improvement of _not breaking_ apt update
    when an "incompatible" architecture combination is declared.
    
    The new spread tests reflect this. Both run in amd64 and add the
    deadsnakes ppa to fetch Python in a foreign arch:
    
    - For i386, only the deadsnakes ppa is necessary, as the architecture
    will be added "globally" and Python's dependencies are found in the
    default archives;
    - For armhf, the ports.ubuntu.com repo is necessary in addition to the
    deadsnakes one. This lets the dependencies be found in the ports repo,
    _and_ doesn't break the build (this combination is broken in Snapcraft
    7.2, 7.3 and 7.4).
    
    Fixes #4289 and #4298
    tigarmo authored and sergiusens committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    1db0f39 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. packaging: fix build for armhf, ppc64el and riscv64

    Move to PyYaml 6.0.1 and constrain to cython < 0 to avoid
    yaml/pyyaml#601
    
    Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
    sergiusens committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    8af2d99 View commit details
    Browse the repository at this point in the history
  2. snap: enable building using current remote-build

    As sources are re-packed, references are broken.
    
    Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
    sergiusens committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    d22913b View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/main' into hotfix/7.5

    Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
    sergiusens committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    82f29a9 View commit details
    Browse the repository at this point in the history