Skip to content

Use jq's IN() instead of index() #165

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

Merged
tianon merged 1 commit into from
Oct 16, 2024
Merged

Use jq's IN() instead of index() #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions Dockerfile-curl.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ RUN set -eux; \
curl \
gnupg \
netbase \
{{ if [
{{ if env.codename | IN(
# we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands; 0.26+)
# https://packages.debian.org/sq
"bullseye", # 0.24
# https://packages.ubuntu.com/sq
"jammy", # 0.25
"focal", # no sq
empty # trailing comma
] | index(env.codename) then "" else ( -}}
) then "" else ( -}}
sq \
{{ ) end -}}
wget \
Expand Down
6 changes: 1 addition & 5 deletions Dockerfile-scm.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ FROM buildpack-deps:{{ env.codename }}-curl
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
{{
if [
"focal", "groovy"
] | index(env.codename) then (
-}}
{{ if env.codename | IN("focal", "groovy") then ( -}}
bzr \
{{ ) else "" end -}}
git \
Expand Down
4 changes: 2 additions & 2 deletions shared.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def apt_get_dist_clean:
if [
if env.codename | IN(
# only suites with APT 2.7.8+ have "apt-get dist-clean"
# https://tracker.debian.org/news/1492892/accepted-apt-278-source-into-unstable/

Expand All @@ -14,7 +14,7 @@ def apt_get_dist_clean:
"focal",

empty
] | index(env.codename) then
) then
"rm -rf /var/lib/apt/lists/*"
else
"apt-get dist-clean"
Expand Down