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.

Sign up for GitHub

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

Jump to bottom

build(deps): bump craft-archives #5124

Merged
merged 2 commits into from
Oct 21, 2024
Merged

build(deps): bump craft-archives #5124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c11c58
build(deps): bump craft-archives
tigarmo Oct 16, 2024
5640986
set proper craft-archives version
tigarmo Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements-devel.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ codespell==2.3.0
colorama==0.4.6
coverage==7.6.1
craft-application==4.2.7
craft-archives==2.0.0
craft-archives @ git+https://github.com/canonical/craft-archives@work/CRAFT-3538-noble-key-conflict
tigarmo marked this conversation as resolved.
Show resolved Hide resolved
craft-cli==2.7.0
craft-grammar==2.0.1
craft-parts==2.1.2
Expand Down
2 changes: 1 addition & 1 deletion requirements-docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ charset-normalizer==3.3.2
click==8.1.7
colorama==0.4.6
craft-application==4.2.7
craft-archives==2.0.0
craft-archives @ git+https://github.com/canonical/craft-archives@work/CRAFT-3538-noble-key-conflict
tigarmo marked this conversation as resolved.
Show resolved Hide resolved
craft-cli==2.7.0
craft-grammar==2.0.1
craft-parts==2.1.2
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chardet==5.2.0
charset-normalizer==3.3.2
click==8.1.7
craft-application==4.2.7
craft-archives==2.0.0
craft-archives @ git+https://github.com/canonical/craft-archives@work/CRAFT-3538-noble-key-conflict
tigarmo marked this conversation as resolved.
Show resolved Hide resolved
craft-cli==2.7.0
craft-grammar==2.0.1
craft-parts==2.1.2
Expand Down
1 change: 1 addition & 0 deletions tests/spread/core24/package-repositories/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ environment:
SNAP/test_multi_keys: test-multi-keys
SNAP/test_foreign_armhf: test-foreign-armhf
SNAP/test_foreign_i386: test-foreign-i386
SNAP/test_key_conflict: test-key-conflict
tigarmo marked this conversation as resolved.
Show resolved Hide resolved

prepare: |
# Remove the currently installed "gpg" and "dirmngr" packages to ensure that
Expand Down
31 changes: 31 additions & 0 deletions tests/spread/core24/package-repositories/test-key-conflict/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: test-key-conflict
version: '1.0'
summary: test package repos with keys already present on the system
tigarmo marked this conversation as resolved.
Show resolved Hide resolved
description: test package repos with keys already present on the system
confinement: strict
base: core24
platforms:
amd64:

package-repositories:
# In core24 this pair of url + suite is already listed in
# /etc/apt/sources.list.d/ubuntu.sources. Add it here to make sure this setup
# is working.
- type: apt
lengau marked this conversation as resolved.
Show resolved Hide resolved
url: http://archive.ubuntu.com/ubuntu
suites: [noble]
components: [main, universe]
architectures: [i386]
key-id: F6ECB3762474EDA9D21B7022871920D1991BC93C
key-server: keyserver.ubuntu.com

parts:
mypart:
plugin: nil
stage-packages:
- zlib1g:i386 # To ensure the package-repo is setup correctly
- hello # there is no hello:i386 in the archives

apps:
test-key-conflict:
command: usr/bin/hello -g hello
Loading