diff --git a/ci-templates/README.adoc b/ci-templates/README.adoc index d4f1a0dc2ad0e28e0dcdb1ef45ca9819866f7c7f..f99eb2cab9fe53aa01771435d84e7d68f09d965d 100644 --- a/ci-templates/README.adoc +++ b/ci-templates/README.adoc @@ -28,7 +28,6 @@ The Core pipeline, defined in link:ci-templates/core.yml[], has the following st * Check files have no trailing whitespace and are `UTF-8` encoded * Check that `C++` files follow this link:clang-format[] -It is important to note that both templates set the variable `GIT_LFS_SKIP_SMUDGE`, which means that when the repositories are cloned/fetched, the files hosted using Git LFS will not be downloaded. An example on how to explicitely fetch the files from LFS can be found in the https://git.code.tecnalia.com/tecnalia_robotics/common_config/blob/e93dbe6379d94e6a895a33c59bf17ccab26eacf9/.gitlab-ci.yml#L132[common_config repository]. == Manual Jobs @@ -52,3 +51,9 @@ The auto rules also allow for using variables to explicitely activate each job: ```yml include::examples/build_vars.yml[] ``` + +== LFS +By default, lfs files are not downloaded. If you need to add LFS, include the link:ci-templates/lfs-pull.yml[] along with anything else: +```yml +include::examples/include_lfs.yml[] +``` \ No newline at end of file diff --git a/ci-templates/examples/include_lfs.yml b/ci-templates/examples/include_lfs.yml new file mode 100644 index 0000000000000000000000000000000000000000..00876e5d7c28a9cb9a6804530361116dff18d99a --- /dev/null +++ b/ci-templates/examples/include_lfs.yml @@ -0,0 +1,5 @@ +include: + - project: tecnalia_robotics-public/gitlab_templates + file: + - ci-templates/auto-rules/kinetic-default.yml + - ci-templates/auto-rules/kinetic-default.yml diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml index e5e3ebae508feecd6cbf4e299842cb029b32e0ea..b1c5d84ffcc3ff45a8cc0fb800e1dd7a08a84228 100644 --- a/ci-templates/industrial-ci-templates.yml +++ b/ci-templates/industrial-ci-templates.yml @@ -12,7 +12,6 @@ PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$current_ws" CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context - ROS_REPO: main .industrial_ci_deploy: