From dde55447d549e375a4970f324e175f357f490656 Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Tue, 11 Jun 2024 21:50:22 +0200 Subject: [PATCH] Update method for copying release files in CI The method to copy release files in the continuous integration pipeline has been changed. Instead of using a complex cp command, we are now simply using a Python script with rsync, which provides cleaner and more readable code. The old method is still present but commented out for history or possible future use. --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5376bf4a4..4db7863880 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,8 @@ build: - mkdir -p ${BUILD_DIR} - ls -la ${BUILD_DIR} - "echo Building Rest..." - # The output below MUST be validated otherwise we expose files that we don't want to expose - # - ./release/release_files.py | sort | uniq | rsync -vrRl --files-from=- . $BUILD_DIR/ - - cp -pR --parents $(cat release/files_common release/files_tici | sort | uniq) $BUILD_DIR/ 2> >(grep -v 'warning:' >&2) + - ./release/release_files.py | sort | uniq | rsync -vrRl --files-from=- . $BUILD_DIR/ + # - cp -pR --parents $(cat release/files_common release/files_tici | sort | uniq) $BUILD_DIR/ 2> >(grep -v 'warning:' >&2) - cd $BUILD_DIR - sed -i '/from .board.jungle import PandaJungle, PandaJungleDFU/s/^/#/' panda/__init__.py # comment panda jungle when prebuilt - scons -j$(nproc) cache_dir=${CI_DIR}/scons_cache --minimal