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

chore(20.04): add lint job #177

Merged
merged 4 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ jobs:
installability-tests:
name: Installability tests
uses: canonical/chisel-releases/.github/workflows/install-slices.yaml@main

lint:
name: Lint
uses: canonical/chisel-releases/.github/workflows/lint.yaml@main
76 changes: 38 additions & 38 deletions chisel.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
format: chisel-v1

archives:
ubuntu:
version: 20.04
components: [main, universe]
suites: [focal, focal-security, focal-updates]
v1-public-keys: [ubuntu-archive-key-2018]
ubuntu:
version: 20.04
components: [main, universe]
suites: [focal, focal-security, focal-updates]
v1-public-keys: [ubuntu-archive-key-2018]

v1-public-keys:
# Ubuntu Archive Automatic Signing Key (2018) <[email protected]>
# rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z
ubuntu-archive-key-2018:
id: "871920D1991BC93C"
armor: |
-----BEGIN PGP PUBLIC KEY BLOCK-----
# Ubuntu Archive Automatic Signing Key (2018) <[email protected]>
# rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z
ubuntu-archive-key-2018:
id: "871920D1991BC93C"
armor: |
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq
dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ
HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq
X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k
KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns
AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta
LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq
VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd
yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv
Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow
DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB
tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm
dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI
AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH
beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG
g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa
Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy
q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF
kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0
LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr
BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5
KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA
QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp
SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+
uOgcXny1UlwtCUzlrSaP
=9AdM
-----END PGP PUBLIC KEY BLOCK-----
mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq
dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ
HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq
X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k
KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns
AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta
LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq
VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd
yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv
Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow
DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB
tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm
dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI
AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH
beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG
g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa
Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy
q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF
kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0
LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr
BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5
KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA
QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp
SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+
uOgcXny1UlwtCUzlrSaP
=9AdM
-----END PGP PUBLIC KEY BLOCK-----
6 changes: 3 additions & 3 deletions slices/base-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package: base-files
slices:
base:
essential:
- base-files_etc
- base-files_bin
- base-files_etc
- base-files_home
- base-files_lib
- base-files_tmp
- base-files_var
- base-files_home

etc:
contents:
Expand Down Expand Up @@ -51,8 +51,8 @@ slices:
contents:
/etc/debian_version:
/etc/dpkg/origins/debian:
/etc/dpkg/origins/ubuntu:
/etc/dpkg/origins/default: {symlink: /etc/dpkg/origins/ubuntu}
/etc/dpkg/origins/ubuntu:
/etc/host.conf:
/etc/issue:
/etc/issue.net:
Expand Down
6 changes: 3 additions & 3 deletions slices/base-passwd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package: base-passwd
slices:
data:
contents:
/usr/share/base-passwd/group.master: {until: mutate}
/usr/share/base-passwd/passwd.master: {until: mutate}
/etc/group: {text: FIXME, mutable: true}
/etc/group: {text: FIXME, mutable: true}
/etc/passwd: {text: FIXME, mutable: true}
/usr/share/base-passwd/group.master: {until: mutate}
/usr/share/base-passwd/passwd.master: {until: mutate}
mutate: |
gr = content.read("/usr/share/base-passwd/group.master")
content.write("/etc/group", gr)
Expand Down
2 changes: 1 addition & 1 deletion slices/bash.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ slices:
# user should manually link /bin/sh to /bin/bash
/bin/bash:
/bin/rbash:
/usr/bin/clear_console:
/usr/bin/bashbug:
/usr/bin/clear_console:
5 changes: 2 additions & 3 deletions slices/ca-certificates-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ slices:
contents:
/etc/default/cacerts:
/etc/ssl/certs/java/:

# we need to run `keytool` in postinst, but we can't yet do
# this from a mutation script
# we need to run `keytool` in postinst, but we can't yet do
# this from a mutation script
4 changes: 3 additions & 1 deletion slices/ca-certificates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ slices:
/usr/share/ca-certificates/mozilla/*: {until: mutate}
mutate: |
certs_dir = "/usr/share/ca-certificates/mozilla/"
certs = [content.read(certs_dir + path) for path in content.list(certs_dir)]
certs = [
content.read(certs_dir + path) for path in content.list(certs_dir)
]
content.write("/etc/ssl/certs/ca-certificates.crt", "".join(certs))
2 changes: 1 addition & 1 deletion slices/fonts-dejavu-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ slices:
/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf:

config:
contents:
/etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf:
Expand Down
6 changes: 3 additions & 3 deletions slices/libc6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ slices:

libs:
contents:
/lib/*-linux-*/ld-*.*.so:
/lib*/ld*.so.*:
/lib/*-linux-*/ld*.so.*:
/lib/*-linux-*/ld-*.*.so:
/lib/*-linux-*/libBrokenLocale-*.*.so:
/lib/*-linux-*/libBrokenLocale.so.*:
/lib/*-linux-*/libSegFault.so:
Expand Down Expand Up @@ -44,8 +45,7 @@ slices:
/lib/*-linux-*/libresolv.so.*:
/lib/*-linux-*/librt-*.*.so:
/lib/*-linux-*/librt.so.*:
/lib/*-linux-*/libthread_db-*.*.so:
/lib/*-linux-*/libthread_db*.so.*:
/lib/*-linux-*/libthread_db-*.*.so:
/lib/*-linux-*/libutil-*.*.so:
/lib/*-linux-*/libutil.so.*:
/lib*/ld*.so.*:
2 changes: 1 addition & 1 deletion slices/libfontconfig1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package: libfontconfig1
slices:
libs:
essential:
- fontconfig-config_config
- libc6_libs
- libexpat1_libs
- libfreetype6_libs
- libuuid1_libs
- fontconfig-config_config
contents:
/usr/lib/*-linux-*/libfontconfig.so.1*:
4 changes: 2 additions & 2 deletions slices/libfreetype6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package: libfreetype6
slices:
libs:
essential:
- libc6_libs
- zlib1g_libs
- libbrotli1_libs
- libc6_libs
- libpng16-16_libs
- zlib1g_libs
contents:
/usr/lib/*-linux-*/libfreetype.so.6*:
2 changes: 1 addition & 1 deletion slices/libglib2.0-0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ slices:

libs:
essential:
- libglib2.0-0_core
- libffi7_libs
- libglib2.0-0_core
- libmount1_libs
- libselinux1_libs
- zlib1g_libs
Expand Down
2 changes: 1 addition & 1 deletion slices/libmount1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package: libmount1
slices:
libs:
essential:
- libblkid1_libs
- libc6_libs
- libselinux1_libs
- libblkid1_libs
contents:
/lib/*-linux-*/libmount.so.1*:
2 changes: 1 addition & 1 deletion slices/libnss3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ slices:
- libnspr4_libs
- libsqlite3-0_libs
contents:
/usr/lib/*-linux-*/libnssutil3.so:
/usr/lib/*-linux-*/libnss3.so:
/usr/lib/*-linux-*/libnssutil3.so:
2 changes: 1 addition & 1 deletion slices/libpython3.8-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ slices:
libs:
essential:
- libc6_libs
- libssl1.1_libs
- libpython3.8-minimal_config
- libssl1.1_libs
contents:
/usr/lib/python3.8/__future__.py:
/usr/lib/python3.8/_bootlocale.py:
Expand Down
36 changes: 18 additions & 18 deletions slices/libpython3.8-stdlib.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package: libpython3.8-stdlib

# The slices in this package have been grouped with inspiration
# from the Python 3.8 Standard Library (https://docs.python.org/3.8/library/index.html).
# Aside from the "core" slice which contains the minimal libraries that
# should come from this package and the "extra" slice which contains
# miscellaneous libraries, all the other slice definitions are sorted
# by their names. The "core" slice is placed at the very beginning and
# the "extra" slice at the very end.
# The slices in this package have been grouped with inspiration from the Python
# 3.8 Standard Library (https://docs.python.org/3.8/library/index.html).
# Aside from the "core" slice which contains the minimal libraries that should
# come from this package and the "extra" slice which contains miscellaneous
# libraries, all the other slice definitions are sorted by their names. The
# "core" slice is placed at the very beginning and the "extra" slice at the
# very end.
slices:
# The "core" slice provides a very minimal libpython3.8-stdlib
core:
essential:
- libpython3.8-minimal_libs
- libc6_libs
- libbz2-1.0_libs
- libc6_libs
- liblzma5_libs
- libpython3.8-minimal_libs
- mime-support_mime-types
contents:
/usr/lib/python3.8/_compression.py:
Expand Down Expand Up @@ -45,10 +45,10 @@ slices:
# https://docs.python.org/3.8/library/allos.html
all-os:
essential:
- libffi7_libs
- libncursesw6_libs
- libpython3.8-stdlib_core
- libpython3.8-stdlib_unix
- libncursesw6_libs
- libffi7_libs
- libtinfo6_libs
contents:
/usr/lib/python3.8/_pyio.py:
Expand All @@ -62,9 +62,9 @@ slices:
# https://docs.python.org/3.8/library/concurrency.html
concurrency:
essential:
- libpython3.8-stdlib_all-os
- libpython3.8-stdlib_core
- libpython3.8-stdlib_crypto
- libpython3.8-stdlib_all-os
contents:
/usr/lib/python3.8/_dummy_thread.py:
/usr/lib/python3.8/concurrent/**:
Expand Down Expand Up @@ -124,9 +124,9 @@ slices:
# https://docs.python.org/3.8/library/development.html
development-tools:
essential:
- libpython3.8-stdlib_core
- libpython3.8-stdlib_all-os
- libpython3.8-stdlib_concurrency
- libpython3.8-stdlib_core
- libpython3.8-stdlib_data-types
- libpython3.8-stdlib_debug
- libpython3.8-stdlib_distribution
Expand Down Expand Up @@ -239,8 +239,8 @@ slices:
# https://docs.python.org/3.8/library/ipc.html
ipc:
essential:
- libpython3.8-stdlib_core
- libpython3.8-stdlib_concurrency
- libpython3.8-stdlib_core
contents:
/usr/lib/python3.8/asynchat.py:
/usr/lib/python3.8/asyncio/**:
Expand Down Expand Up @@ -302,8 +302,8 @@ slices:
# https://docs.python.org/3.8/library/numeric.html
numeric:
essential:
- libpython3.8-stdlib_core
- libmpdec2_libs
- libpython3.8-stdlib_core
contents:
/usr/lib/python3.8/_pydecimal.py:
/usr/lib/python3.8/decimal.py:
Expand All @@ -323,8 +323,8 @@ slices:
# https://docs.python.org/3.8/library/persistence.html
data-persistence:
essential:
- libpython3.8-stdlib_core
- libdb5.3_libs
- libpython3.8-stdlib_core
- libsqlite3-0_libs
contents:
/usr/lib/python3.8/dbm/**:
Expand All @@ -339,8 +339,8 @@ slices:
essential:
- libpython3.8-stdlib_core
contents:
/usr/lib/python3.8/pydoc_data/**:
/usr/lib/python3.8/pydoc.py:
/usr/lib/python3.8/pydoc_data/**:

# Text Processing Services
# https://docs.python.org/3.8/library/text.html
Expand All @@ -358,9 +358,9 @@ slices:
# https://docs.python.org/3.8/library/unix.html
unix:
essential:
- libcrypt1_libs
- libpython3.8-stdlib_core
- libpython3.8-stdlib_frameworks
- libcrypt1_libs
contents:
/usr/lib/python3.8/crypt.py:
/usr/lib/python3.8/lib-dynload/_crypt.cpython-38-*-linux-*.so:
Expand Down
2 changes: 1 addition & 1 deletion slices/libreadline8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ slices:
- libtinfo6_libs
- readline-common_config
contents:
/lib/*-linux-*/libreadline.so.8*:
/lib/*-linux-*/libhistory.so.8*:
/lib/*-linux-*/libreadline.so.8*:
2 changes: 1 addition & 1 deletion slices/libunwind8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ slices:
- liblzma5_libs
contents:
/usr/lib/*-linux-*/libunwind-*.so.*:
/usr/lib/*-linux-*/libunwind.so.8.*:
/usr/lib/*-linux-*/libunwind.so.8:
/usr/lib/*-linux-*/libunwind.so.8.*:
Loading
Loading