Skip to content

Commit

Permalink
build(deps): bump craft-archives
Browse files Browse the repository at this point in the history
This update fixes LP#2083013, where some package-repositories declarations
could conflict with default sources present in Noble and later.
  • Loading branch information
tigarmo committed Oct 16, 2024
1 parent fceb8c1 commit afebe09
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements-devel.txt
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
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
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
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
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
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
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

prepare: |
# Remove the currently installed "gpg" and "dirmngr" packages to ensure that
Expand Down
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
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
url: http://archive.ubuntu.com/ubuntu
suites: [noble-updates]
components: [main, universe]
architectures: [i386]
key-id: F6ECB3762474EDA9D21B7022871920D1991BC93C
key-server: keyserver.ubuntu.com

parts:
mypart:
plugin: nil
stage-packages:
- curl:i386
- hello # there is no hello:i386 in the archives

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

0 comments on commit afebe09

Please sign in to comment.