diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2023-02-08 12:31:41 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2023-02-08 12:31:41 +0000 |
| commit | ddb7d94edd47ee64836dc5b9d2bad82c7dda2f3a (patch) | |
| tree | 8d369a1f1c8aeaf89edc662285805ee8b419674e | |
| parent | 003959ebce9dfded9b56d3cd3997d0b8edf5ce6b (diff) | |
| download | libvirt-ci-ddb7d94edd47ee64836dc5b9d2bad82c7dda2f3a.zip libvirt-ci-ddb7d94edd47ee64836dc5b9d2bad82c7dda2f3a.tar.gz libvirt-ci-ddb7d94edd47ee64836dc5b9d2bad82c7dda2f3a.tar.bz2 | |
facts: switch to unversioned llvm for Alpine
Alpine ships many versions of llvm in parallel. There is no reason why
we need to fixate on version 11 though, especially since it is dropped
in Alpine Edge. Switching to the unversioned llvm alias lets apk pick
the newest version per releae stream.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | lcitool/facts/mappings.yml | 1 | ||||
| -rw-r--r-- | tests/data/formatters/out/alpine-315-all-projects.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/data/formatters/out/alpine-316-all-projects.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/data/formatters/out/alpine-edge-all-projects.Dockerfile | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/alpine-315.yml | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/alpine-316.yml | 2 | ||||
| -rw-r--r-- | tests/data/packages/out/alpine-edge.yml | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml index c2d2288..81b21ce 100644 --- a/lcitool/facts/mappings.yml +++ b/lcitool/facts/mappings.yml @@ -1169,7 +1169,6 @@ mappings: llvm: default: llvm - apk: llvm11 locales: deb: locales diff --git a/tests/data/formatters/out/alpine-315-all-projects.Dockerfile b/tests/data/formatters/out/alpine-315-all-projects.Dockerfile index 5fabdb9..5aae3de 100644 --- a/tests/data/formatters/out/alpine-315-all-projects.Dockerfile +++ b/tests/data/formatters/out/alpine-315-all-projects.Dockerfile @@ -107,7 +107,7 @@ RUN apk update && \ libxslt \ libxslt-dev \ linux-pam-dev \ - llvm11 \ + llvm \ lttng-ust-dev \ lua5.4 \ lvm2 \ diff --git a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile index cb4eae3..cc6ca9c 100644 --- a/tests/data/formatters/out/alpine-316-all-projects.Dockerfile +++ b/tests/data/formatters/out/alpine-316-all-projects.Dockerfile @@ -107,7 +107,7 @@ RUN apk update && \ libxslt \ libxslt-dev \ linux-pam-dev \ - llvm11 \ + llvm \ lttng-ust-dev \ lua5.4 \ lvm2 \ diff --git a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile index f9a66d4..f5acf2d 100644 --- a/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile +++ b/tests/data/formatters/out/alpine-edge-all-projects.Dockerfile @@ -107,7 +107,7 @@ RUN apk update && \ libxslt \ libxslt-dev \ linux-pam-dev \ - llvm11 \ + llvm \ lttng-ust-dev \ lua5.4 \ lvm2 \ diff --git a/tests/data/packages/out/alpine-315.yml b/tests/data/packages/out/alpine-315.yml index d5dcf68..2113fd0 100644 --- a/tests/data/packages/out/alpine-315.yml +++ b/tests/data/packages/out/alpine-315.yml @@ -124,7 +124,7 @@ native: - libxslt - libxslt-dev - linux-pam-dev -- llvm11 +- llvm - lsof - lttng-ust-dev - lua5.4 diff --git a/tests/data/packages/out/alpine-316.yml b/tests/data/packages/out/alpine-316.yml index c0adbf9..e42e022 100644 --- a/tests/data/packages/out/alpine-316.yml +++ b/tests/data/packages/out/alpine-316.yml @@ -124,7 +124,7 @@ native: - libxslt - libxslt-dev - linux-pam-dev -- llvm11 +- llvm - lsof - lttng-ust-dev - lua5.4 diff --git a/tests/data/packages/out/alpine-edge.yml b/tests/data/packages/out/alpine-edge.yml index c0adbf9..e42e022 100644 --- a/tests/data/packages/out/alpine-edge.yml +++ b/tests/data/packages/out/alpine-edge.yml @@ -124,7 +124,7 @@ native: - libxslt - libxslt-dev - linux-pam-dev -- llvm11 +- llvm - lsof - lttng-ust-dev - lua5.4 |