Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
templates
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Prada Sarasola, Miguel
templates
Commits
9942716b
Commit
9942716b
authored
1 year ago
by
Prada Sarasola, Miguel
Browse files
Options
Downloads
Patches
Plain Diff
Extend possibility to pull scripts from custom branches to all scripts
in templates
parent
595257a5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci-templates/industrial-ci-templates.yml
+2
-1
2 additions, 1 deletion
ci-templates/industrial-ci-templates.yml
ci-templates/syntax-check.yml
+5
-2
5 additions, 2 deletions
ci-templates/syntax-check.yml
with
7 additions
and
3 deletions
ci-templates/industrial-ci-templates.yml
+
2
−
1
View file @
9942716b
...
@@ -10,7 +10,8 @@
...
@@ -10,7 +10,8 @@
DOCKER_IMAGE
:
"
${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
DOCKER_IMAGE
:
"
${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
ADDITIONAL_DEBS
:
curl
ADDITIONAL_DEBS
:
curl
PARALLEL_BUILDS
:
2
# keep this for now, since there seems to be memory limit issues in the ci VM
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"
GITLAB_TEMPLATES_BRANCH
:
master
AFTER_SETUP_TARGET_WORKSPACE
:
"
rosenv
&&
bash
<(curl
-Ls
https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/ci_run_entry_points.sh)
$$current_ws"
CMAKE_ARGS
:
-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
CMAKE_ARGS
:
-DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
...
...
This diff is collapsed.
Click to expand it.
ci-templates/syntax-check.yml
+
5
−
2
View file @
9942716b
...
@@ -7,12 +7,13 @@ clang_format:
...
@@ -7,12 +7,13 @@ clang_format:
before_script
:
before_script
:
-
apk add --update bash coreutils tar wget
-
apk add --update bash coreutils tar wget
-
git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
-
git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
-
wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/
master
/clang-format -O .clang-format
-
wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/
${GITLAB_TEMPLATES_BRANCH}
/clang-format -O .clang-format
script
:
.ci_config/gitlab.sh
script
:
.ci_config/gitlab.sh
variables
:
variables
:
ROS_DISTRO
:
kinetic
ROS_DISTRO
:
kinetic
CLANG_FORMAT_CHECK
:
file
CLANG_FORMAT_CHECK
:
file
CLANG_FORMAT_VERSION
:
"
3.8"
CLANG_FORMAT_VERSION
:
"
3.8"
GITLAB_TEMPLATES_BRANCH
:
master
when
:
always
when
:
always
##########################################################
##########################################################
...
@@ -77,8 +78,10 @@ file_syntax:
...
@@ -77,8 +78,10 @@ file_syntax:
adoc_syntax
:
adoc_syntax
:
stage
:
.post
stage
:
.post
image
:
tecnalia-docker-dev.artifact.tecnalia.com/alpine
image
:
tecnalia-docker-dev.artifact.tecnalia.com/alpine
variables
:
GITLAB_TEMPLATES_BRANCH
:
master
before_script
:
before_script
:
-
apk add --update curl asciidoctor bash
-
apk add --update curl asciidoctor bash
script
:
script
:
-
curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/
master
/scripts/asciidoctor_syntax_check.bash | bash -s -- .
-
curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/
${GITLAB_TEMPLATES_BRANCH}
/scripts/asciidoctor_syntax_check.bash | bash -s -- .
when
:
always
when
:
always
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment