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

Hotfix/7.5 merge #4281

Closed
wants to merge 15 commits into from
Closed

Hotfix/7.5 merge #4281

wants to merge 15 commits into from

Conversation

sergiusens
Copy link
Collaborator

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run make lint?
  • Have you successfully run pytest tests/unit?

lengau and others added 15 commits June 29, 2023 19:54
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
godeps can not longer build due to

   golang/go#57051

Instead of removing the godeps feature, disable the tests in case the
upstream fixes the problem.
The new version supports asset files that contain more than one key
(for whatever reason). This is more in line with the behavior done by
the previous implementation (via apt-key).

Closes #4224
remove extra build environment variables that are causing build failures.

Co-authored-by: Scarlett Gately Moore <sgmoore@debian.org>
This commit adds a spread test to check the "Set up classic confinement
for a Python project" tutorial. As an overview, the test:

- runs specifically on Ubuntu 20.04 systems;
- clones the test repo from snapcraft-docs/python-ctypes-example;
- builds & installs the snap from the test repo;
- runs the snap on the 20.04 system, to ensure the patchelf fix is
  working in the presence of the classic confinement.

Co-authored-by: Callahan <callahan.kovacs@canonical.com>
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Version 1.1.2 allows local package repositories (those with scheme
`url: file:///...`) again.
snapcraft-started-at is a manifest field. This suggests that upload
never sent built_at because it was trying to extract it from
meta/snap.yaml instead of snap/manifest.yaml.

The unused before this change test file test-snap-with-started-at.snap
was updated accordingly:

- snapcraft-started-at field was removed from meta/snap.yaml,
- and a new snap/manifest.yaml was added.

The change was tested against the Store.

Co-authored-by: Sergio Schvezov <sergio.schvezov@canonical.com>
Co-authored-by: Callahan <callahan.kovacs@canonical.com>
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
@codecov-commenter
Copy link

codecov-commenter commented Jul 16, 2023

Codecov Report

Merging #4281 (bf622f9) into main (4c6b1fd) will increase coverage by 0.12%.
The diff coverage is 93.54%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@            Coverage Diff             @@
##             main    #4281      +/-   ##
==========================================
+ Coverage   88.98%   89.10%   +0.12%     
==========================================
  Files         296      299       +3     
  Lines       20194    20640     +446     
==========================================
+ Hits        17970    18392     +422     
- Misses       2224     2248      +24     
Impacted Files Coverage Δ
snapcraft_legacy/_store.py 77.32% <87.50%> (+<0.01%) ⬆️
...apcraft_legacy/internal/meta/package_repository.py 90.00% <90.00%> (ø)
snapcraft_legacy/internal/repo/apt_ppa.py 90.90% <90.90%> (ø)
...pcraft_legacy/internal/repo/apt_sources_manager.py 95.40% <95.40%> (ø)
snapcraft_legacy/internal/repo/apt_key_manager.py 98.59% <98.59%> (ø)
snapcraft/commands/upload.py 85.71% <100.00%> (+0.60%) ⬆️
snapcraft/meta/snap_yaml.py 97.24% <100.00%> (+0.21%) ⬆️
snapcraft_legacy/internal/meta/snap.py 97.67% <100.00%> (ø)
...napcraft_legacy/internal/project_loader/_config.py 92.09% <100.00%> (+0.03%) ⬆️

... and 7 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@sergiusens sergiusens closed this Aug 4, 2023
@sergiusens sergiusens deleted the hotfix/7.5-merge branch August 4, 2023 14:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants