Skip to content

Commit 8a92553

Browse files
authored
tw/ldd-check cleanup batch 27 (#47185)
This cleans up use of ldd-check, replacing test/ldd-check with test/tw/ldd-check and dropping the defaults where applicable. tests passed at https://github.com/wolfi-dev/os/pull/47185/checks?check_run_id=38920550738
1 parent 34afcb3 commit 8a92553

15 files changed

+12
-56
lines changed

imath.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ subpackages:
5151
test:
5252
pipeline:
5353
- uses: test/pkgconf
54-
- uses: test/ldd-check
55-
with:
56-
packages: imath-dev
54+
- uses: test/tw/ldd-check
5755

5856
- name: py3-imath
5957
pipeline:

imlib2.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,4 @@ test:
6868
imlib2_load version
6969
imlib2_conv --help
7070
imlib2_load help
71-
- uses: test/ldd-check
72-
with:
73-
packages: ${{package.name}}
71+
- uses: test/tw/ldd-check

inih.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ subpackages:
5050
pipeline:
5151
- uses: test/pkgconf
5252
- uses: test/tw/ldd-check
53-
with:
54-
packages: inih-dev
5553

5654
- name: inih-static
5755
description: inih static
@@ -68,6 +66,4 @@ update:
6866

6967
test:
7068
pipeline:
71-
- uses: test/ldd-check
72-
with:
73-
packages: ${{package.name}}
69+
- uses: test/tw/ldd-check

iniparser.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ subpackages:
4747
pipeline:
4848
- uses: test/pkgconf
4949
- uses: test/tw/ldd-check
50-
with:
51-
packages: iniparser-dev
5250

5351
- name: "iniparser-doc"
5452
description: "iniparser documentation"
@@ -72,5 +70,3 @@ update:
7270
test:
7371
pipeline:
7472
- uses: test/tw/ldd-check
75-
with:
76-
packages: iniparser

iperf3.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,3 @@ test:
7777
iperf3 --version
7878
iperf3 --help
7979
- uses: test/tw/ldd-check
80-
with:
81-
packages: iperf3

iptables.yaml

+3-11
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ subpackages:
8787
setcap cap_net_raw,cap_net_admin+eip ${{targets.contextdir}}/usr/bin/xtables-nft-multi
8888
test:
8989
pipeline:
90-
- uses: test/ldd-check
91-
with:
92-
packages: $(basename ${{targets.contextdir}})
90+
- uses: test/tw/ldd-check
9391
dependencies:
9492
runtime:
9593
- merged-sbin
@@ -115,8 +113,6 @@ subpackages:
115113
pipeline:
116114
- uses: test/pkgconf
117115
- uses: test/tw/ldd-check
118-
with:
119-
packages: iptables-dev
120116
dependencies:
121117
runtime:
122118
- merged-sbin
@@ -136,9 +132,7 @@ subpackages:
136132
mv "${{targets.destdir}}"/usr/lib/xtables/libip6* usr/lib/xtables/
137133
test:
138134
pipeline:
139-
- uses: test/ldd-check
140-
with:
141-
packages: $(basename ${{targets.contextdir}})
135+
- uses: test/tw/ldd-check
142136
- runs: |
143137
ip6tables --version
144138
ip6tables --help
@@ -212,6 +206,4 @@ test:
212206
iptables-nft-restore --help
213207
iptables-restore --help
214208
iptables-translate --help
215-
- uses: test/ldd-check
216-
with:
217-
packages: ${{package.name}}
209+
- uses: test/tw/ldd-check

isa-l.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ subpackages:
4141
pipeline:
4242
- uses: test/pkgconf
4343
- uses: test/tw/ldd-check
44-
with:
45-
packages: isa-l-dev
4644

4745
- name: isa-l-doc
4846
pipeline:
@@ -70,8 +68,6 @@ test:
7068
igzip --version
7169
igzip --help
7270
- uses: test/tw/ldd-check
73-
with:
74-
packages: isa-l
7571
- name: Compare igzip to gzip
7672
runs: |
7773
time igzip -3 -n < $(which kubectl) > igzip.gz

isl.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,4 @@ update:
6262

6363
test:
6464
pipeline:
65-
- uses: test/ldd-check
66-
with:
67-
packages: ${{package.name}}
65+
- uses: test/tw/ldd-check

jack.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,4 @@ test:
8787
- runs: |
8888
jackd --version
8989
jackd --help
90-
- uses: test/ldd-check
91-
with:
92-
packages: ${{package.name}}
90+
- uses: test/tw/ldd-check

jansson.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ subpackages:
4646
pipeline:
4747
- uses: test/pkgconf
4848
- uses: test/tw/ldd-check
49-
with:
50-
packages: jansson-dev
5149

5250
update:
5351
enabled: true
@@ -58,5 +56,3 @@ update:
5856
test:
5957
pipeline:
6058
- uses: test/tw/ldd-check
61-
with:
62-
packages: jansson

java-gcj-compat.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ subpackages:
8181
8282
test:
8383
pipeline:
84-
- uses: test/ldd-check
85-
with:
86-
packages: ${{package.name}}
84+
- uses: test/tw/ldd-check
8785

8886
update:
8987
enabled: false

jitterentropy-library.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ test:
6161
runs: |
6262
test "$(readlink /usr/lib/libjitterentropy.so.${{vars.major-version}})" = "libjitterentropy.so.${{package.version}}"
6363
- uses: test/tw/ldd-check
64-
with:
65-
packages: jitterentropy-library
6664
- name: Check library functionality
6765
runs: |
6866
cat <<EOF > test.c

jq.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,4 @@ test:
7878
- name: Using jq to transform JSON structure
7979
runs: |
8080
echo '[{"id":1,"name":"John"},{"id":2,"name":"Jane"}]' | jq '{users: map({userId: .id, userName: .name})}' | grep -E '"userId": 1|"userId": 2' || exit 1
81-
- uses: test/ldd-check
82-
with:
83-
packages: ${{package.name}}
81+
- uses: test/tw/ldd-check

jruby-9.4.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,4 @@ update:
7474

7575
test:
7676
pipeline:
77-
- uses: test/ldd-check
78-
with:
79-
packages: ${{package.name}}
77+
- uses: test/tw/ldd-check

jvmkill.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,4 @@ update:
3535

3636
test:
3737
pipeline:
38-
- uses: test/ldd-check
39-
with:
40-
packages: ${{package.name}}
38+
- uses: test/tw/ldd-check

0 commit comments

Comments
 (0)