ci/prepare-artifacts: use find's -exec instead of iterating over its output with xargs
Also, split the `/ci/` part out to simplify the filename checks. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30384>
This commit is contained in:

committed by
Marge Bot

parent
1f70af7e9f
commit
197701b860
@@ -43,10 +43,14 @@ cp -Rp .gitlab-ci/setup-test-env.sh install/
|
||||
cp -Rp .gitlab-ci/*-runner.sh install/
|
||||
cp -Rp .gitlab-ci/bin/structured_logger.py install/
|
||||
cp -Rp .gitlab-ci/bin/custom_logger.py install/
|
||||
find . -path \*/ci/\*.txt \
|
||||
-o -path \*/ci/\*.toml \
|
||||
-o -path \*/ci/\*traces\*.yml \
|
||||
| xargs -I '{}' cp -p '{}' install/
|
||||
|
||||
find src/ -path '*/ci/*' \
|
||||
\( \
|
||||
-name '*.txt' \
|
||||
-o -name '*.toml' \
|
||||
-o -name '*traces*.yml' \
|
||||
\) \
|
||||
-exec cp -p {} install/ \;
|
||||
|
||||
# Tar up the install dir so that symlinks and hardlinks aren't each
|
||||
# packed separately in the zip file.
|
||||
|
Reference in New Issue
Block a user