Skip to content

Commit 95eac99

Browse files
committed
build: rename print-version target to installcheck
To make it consistent with the standard GNU make targets. From the manual of GNU Make (version 4.4.1-2): > 'installcheck' > Perform installation tests (if any). The user must build and > install the program before running the tests. You should not > assume that '$(bindir)' is in the search path. Commands used to search and replace: $ git grep -Ilz print-version | xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\$(sed 's/print-version/installcheck/g' '{}')\" >'{}'" Added on commit c9531d9 ("build: add print-version target and use in CI", 2024-02-22) / netblue30#6230.
1 parent cedf5e9 commit 95eac99

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

.github/workflows/build-extra.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ jobs:
7272
- name: make install
7373
run: sudo make install
7474
- name: print version
75-
run: make print-version
75+
run: make installcheck

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ jobs:
8888
- name: make install
8989
run: sudo make install
9090
- name: print version
91-
run: make print-version
91+
run: make installcheck

.github/workflows/test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: make install
8383
run: sudo make install
8484
- name: print version
85-
run: make print-version
85+
run: make installcheck
8686
- run: make lab-setup
8787
- run: make test-seccomp-extra
8888
- run: make test-firecfg
@@ -131,7 +131,7 @@ jobs:
131131
- name: make install
132132
run: sudo make install
133133
- name: print version
134-
run: make print-version
134+
run: make installcheck
135135
- run: make lab-setup
136136
- run: make test-private-etc
137137
- run: make test-fs
@@ -171,7 +171,7 @@ jobs:
171171
- name: make install
172172
run: sudo make install
173173
- name: print version
174-
run: make print-version
174+
run: make installcheck
175175
- run: make lab-setup
176176
- run: make test-environment
177177
- run: make test-profiles
@@ -214,7 +214,7 @@ jobs:
214214
- name: make install
215215
run: sudo make install
216216
- name: print version
217-
run: make print-version
217+
run: make installcheck
218218
- run: make lab-setup
219219
- run: make test-utils
220220

@@ -261,7 +261,7 @@ jobs:
261261
- name: make install
262262
run: sudo make install
263263
- name: print version
264-
run: make print-version
264+
run: make installcheck
265265
- run: make lab-setup
266266
- run: make test-fnetfilter
267267
- run: make test-sysutils

.gitlab-ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ build_ubuntu_package:
2525
- make dist
2626
- ./mkdeb.sh --enable-fatal-warnings
2727
- dpkg -i ./*.deb
28-
- make print-version
28+
- make installcheck
2929

3030
build_debian_package:
3131
image: debian:buster
@@ -43,7 +43,7 @@ build_debian_package:
4343
- make dist
4444
- ./mkdeb.sh --enable-fatal-warnings
4545
- dpkg -i ./*.deb
46-
- make print-version
46+
- make installcheck
4747

4848
build_no_apparmor:
4949
image: ubuntu:latest
@@ -63,8 +63,8 @@ build_no_apparmor:
6363
./mkdeb.sh --enable-fatal-warnings
6464
--disable-apparmor
6565
- dpkg -i ./*.deb
66-
- make print-version
67-
- make print-version | grep -F 'AppArmor support is disabled'
66+
- make installcheck
67+
- make installcheck | grep -F 'AppArmor support is disabled'
6868

6969
build_redhat_package:
7070
image: almalinux:latest
@@ -77,7 +77,7 @@ build_redhat_package:
7777
- make dist
7878
- ./platform/rpm/mkrpm.sh --enable-fatal-warnings
7979
- rpm -i ./*.rpm
80-
- make print-version
80+
- make installcheck
8181

8282
build_fedora_package:
8383
image: fedora:latest
@@ -90,7 +90,7 @@ build_fedora_package:
9090
- make dist
9191
- ./platform/rpm/mkrpm.sh --enable-fatal-warnings
9292
- rpm -i ./*.rpm
93-
- make print-version
93+
- make installcheck
9494

9595
# FIXME: Cannot build src/libtrace with musl (see #6610).
9696
#build_src_package:
@@ -108,7 +108,7 @@ build_fedora_package:
108108
# || (cat config.log; exit 1)
109109
# - make
110110
# - make install-strip
111-
# - make print-version
111+
# - make installcheck
112112

113113
debian_ci:
114114
image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,8 @@ codespell:
400400
print-env:
401401
./ci/printenv.sh
402402

403-
.PHONY: print-version
404-
print-version: config.mk
403+
.PHONY: installcheck
404+
installcheck: config.mk
405405
command -V $(TARNAME) && $(TARNAME) --version
406406

407407
#

gcov.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ make -j "$(nproc)" &&
2727
sudo make install
2828

2929
rm -fr gcov-dir gcov-file
30-
make print-version
30+
make installcheck
3131
gcov_generate
3232

3333
make test-firecfg | grep TESTING

0 commit comments

Comments
 (0)