Skip to content

Commit ef643ff

Browse files
authored
tw/ldd-check cleanup batch 20 (#47178)
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/47178/checks?check_run_id=39037973855
1 parent a3e73b5 commit ef643ff

15 files changed

+7
-53
lines changed

libutempter.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ subpackages:
4545
test:
4646
pipeline:
4747
- uses: test/tw/ldd-check
48-
with:
49-
packages: libutempter-dev
5048

5149
- name: libutempter-doc
5250
pipeline:
@@ -66,5 +64,3 @@ update:
6664
test:
6765
pipeline:
6866
- uses: test/tw/ldd-check
69-
with:
70-
packages: libutempter

libuv.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ subpackages:
4545
pipeline:
4646
- uses: test/pkgconf
4747
- uses: test/tw/ldd-check
48-
with:
49-
packages: libuv-dev
5048

5149
update:
5250
enabled: true
@@ -83,6 +81,4 @@ test:
8381
8482
gcc test_libuv.c -o test_libuv -luv || (echo "libuv test compilation failed!" && exit 1)
8583
./test_libuv || (echo "libuv test failed!" && exit 1)
86-
- uses: test/ldd-check
87-
with:
88-
packages: ${{package.name}}
84+
- uses: test/tw/ldd-check

libva.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ subpackages:
5252
pipeline:
5353
- uses: test/pkgconf
5454
- uses: test/tw/ldd-check
55-
with:
56-
packages: libva-dev
5755
description: libva dev
5856

5957
update:
@@ -64,5 +62,3 @@ update:
6462
test:
6563
pipeline:
6664
- uses: test/tw/ldd-check
67-
with:
68-
packages: libva

libverto.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ subpackages:
7373
mv ${{targets.destdir}}/usr/lib/libverto-${{range.key}}.so.* ${{targets.subpkgdir}}/usr/lib/
7474
test:
7575
pipeline:
76-
- uses: test/ldd-check
77-
with:
78-
packages: $(basename ${{targets.contextdir}})
76+
- uses: test/tw/ldd-check
7977
description: ${{range.key}} driver for libverto
8078

8179
update:

libvncserver.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ subpackages:
6969
pipeline:
7070
- uses: test/pkgconf
7171
- uses: test/tw/ldd-check
72-
with:
73-
packages: libvncserver-dev
7472

7573
update:
7674
enabled: true
@@ -83,5 +81,3 @@ update:
8381
test:
8482
pipeline:
8583
- uses: test/tw/ldd-check
86-
with:
87-
packages: libvncserver

libwebp.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ subpackages:
5353
pipeline:
5454
- uses: test/pkgconf
5555
- uses: test/tw/ldd-check
56-
with:
57-
packages: libwebp-dev
5856

5957
- name: libwebp-doc
6058
pipeline:

libwebsockets.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ subpackages:
6868
pipeline:
6969
- uses: test/pkgconf
7070
- uses: test/tw/ldd-check
71-
with:
72-
packages: libwebsockets-dev
7371

7472
- name: libwebsockets-test
7573
pipeline:
@@ -91,9 +89,7 @@ subpackages:
9189
mv ${{targets.destdir}}/usr/lib/libwebsockets-evlib_uv.so ${{targets.subpkgdir}}/usr/lib/
9290
test:
9391
pipeline:
94-
- uses: test/ldd-check
95-
with:
96-
packages: $(basename ${{targets.contextdir}})
92+
- uses: test/tw/ldd-check
9793
description: libwebsocket plugin
9894

9995
update:

libx11.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ subpackages:
7272
pipeline:
7373
- uses: test/pkgconf
7474
- uses: test/tw/ldd-check
75-
with:
76-
packages: libx11-dev
7775

7876
update:
7977
enabled: true

libxau.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ subpackages:
5151
pipeline:
5252
- uses: test/pkgconf
5353
- uses: test/tw/ldd-check
54-
with:
55-
packages: libxau-dev
5654

5755
- name: libxau-doc
5856
pipeline:

libxaw.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ subpackages:
5757
test:
5858
pipeline:
5959
- uses: test/pkgconf
60-
- uses: test/ldd-check
61-
with:
62-
packages: $(basename ${{targets.contextdir}})
60+
- uses: test/tw/ldd-check
6361

6462
- name: libxaw-doc
6563
pipeline:

libxcb.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ subpackages:
7575
pipeline:
7676
- uses: test/pkgconf
7777
- uses: test/tw/ldd-check
78-
with:
79-
packages: libxcb-dev
8078

8179
update:
8280
enabled: true

libxcomposite.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ subpackages:
5555
pipeline:
5656
- uses: test/pkgconf
5757
- uses: test/tw/ldd-check
58-
with:
59-
packages: libxcomposite-dev
6058

6159
- name: libxcomposite-doc
6260
pipeline:

libxcrypt.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ subpackages:
8181
pipeline:
8282
- uses: test/pkgconf
8383
- uses: test/tw/ldd-check
84-
with:
85-
packages: libxcrypt-dev
8684

8785
update:
8886
enabled: true
@@ -93,6 +91,4 @@ update:
9391

9492
test:
9593
pipeline:
96-
- uses: test/ldd-check
97-
with:
98-
packages: ${{package.name}}
94+
- uses: test/tw/ldd-check

libxcvt.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ subpackages:
3333
pipeline:
3434
- uses: test/pkgconf
3535
- uses: test/tw/ldd-check
36-
with:
37-
packages: libxcvt-dev
3836

3937
- name: libxcvt-doc
4038
pipeline:

libxml2.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ subpackages:
7272
description: libxml2 python3 bindings
7373
test:
7474
pipeline:
75-
- uses: test/ldd-check
76-
with:
77-
packages: $(basename ${{targets.contextdir}})
75+
- uses: test/tw/ldd-check
7876

7977
- name: libxml2-utils
8078
pipeline:
@@ -147,8 +145,6 @@ subpackages:
147145
./test || exit 1
148146
- uses: test/pkgconf
149147
- uses: test/tw/ldd-check
150-
with:
151-
packages: libxml2-dev
152148

153149
update:
154150
enabled: true
@@ -157,6 +153,4 @@ update:
157153

158154
test:
159155
pipeline:
160-
- uses: test/ldd-check
161-
with:
162-
packages: ${{package.name}}
156+
- uses: test/tw/ldd-check

0 commit comments

Comments
 (0)