Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
battery_monitor
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
drivers
battery_monitor
Commits
c5519456
Commit
c5519456
authored
5 years ago
by
Fernando Herrero
Browse files
Options
Downloads
Patches
Plain Diff
CI: add firmware dependencies
parent
9d37fcf3
No related branches found
No related tags found
No related merge requests found
Pipeline
#4061
passed
5 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+6
-7
6 additions, 7 deletions
.gitlab-ci.yml
src/CMakeLists.txt
+2
-1
2 additions, 1 deletion
src/CMakeLists.txt
with
8 additions
and
8 deletions
.gitlab-ci.yml
+
6
−
7
View file @
c5519456
...
@@ -5,7 +5,8 @@
...
@@ -5,7 +5,8 @@
before_script
:
before_script
:
-
apt update
-
apt update
-
apt -y install git sudo
-
apt -y install git
#add to docker image?
-
apt -y install sudo
#needed for sudo commands in privileges.sh script
-
which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
-
which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )
-
eval $(ssh-agent -s)
-
eval $(ssh-agent -s)
-
echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-
echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
...
@@ -14,8 +15,6 @@
...
@@ -14,8 +15,6 @@
-
ssh-keyscan -p 2202 gitlab.iri.upc.edu >> ~/.ssh/known_hosts
-
ssh-keyscan -p 2202 gitlab.iri.upc.edu >> ~/.ssh/known_hosts
-
chmod 644 ~/.ssh/known_hosts
-
chmod 644 ~/.ssh/known_hosts
-
ssh -p 2202 git@gitlab.iri.upc.edu
#test
-
ssh -p 2202 git@gitlab.iri.upc.edu
#test
-
apt update
-
apt -y install git
-
git submodule sync --recursive
-
git submodule sync --recursive
-
git submodule update --init --recursive
-
git submodule update --init --recursive
...
@@ -29,12 +28,14 @@
...
@@ -29,12 +28,14 @@
script
:
script
:
-
apt update
-
apt update
-
apt -y install iri-iriutils-dev iri-comm-dev iri-dynamixel-dev
-
apt -y install iri-iriutils-dev iri-comm-dev iri-dynamixel-dev
-
apt -y install gcc-avr avr-libc
#firmware dependencies
-
mkdir -pv build
-
mkdir -pv build
-
cd build
-
cd build
-
cmake -DCMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG ..
-
cmake -DCMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG ..
-
ls ..
-
ls ..
-
make package -j $(nproc)
-
make firmware -j $(nproc)
-
make firmware -j $(nproc)
-
make package -j $(nproc)
artifacts
:
artifacts
:
paths
:
paths
:
-
build/*.deb
-
build/*.deb
...
@@ -49,6 +50,4 @@
...
@@ -49,6 +50,4 @@
-
"
scp
-i
/root/.ssh/iriLabKeyNopwd
-r
*battery-monitor*.deb
irilabo@147.83.76.226:packages/"
-
"
scp
-i
/root/.ssh/iriLabKeyNopwd
-r
*battery-monitor*.deb
irilabo@147.83.76.226:packages/"
-
"
ssh
irilabo@147.83.76.226
-i
/root/.ssh/iriLabKeyNopwd
-tt
/home/irilabo/repo_scripts/update_repo.sh
battery-monitor"
-
"
ssh
irilabo@147.83.76.226
-i
/root/.ssh/iriLabKeyNopwd
-tt
/home/irilabo/repo_scripts/update_repo.sh
battery-monitor"
only
:
only
:
-
tags
-
tags
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
2
−
1
View file @
c5519456
...
@@ -64,4 +64,5 @@ add_custom_target(firmware COMMAND make
...
@@ -64,4 +64,5 @@ add_custom_target(firmware COMMAND make
INSTALL
(
FILES
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/../
${
firmware_dir
}
/avr8_battery_monitor_eeprom.hex
${
CMAKE_CURRENT_SOURCE_DIR
}
/../
${
firmware_dir
}
/avr8_battery_monitor_eeprom.hex
${
CMAKE_CURRENT_SOURCE_DIR
}
/../
${
firmware_dir
}
/avr8_battery_monitor.hex
${
CMAKE_CURRENT_SOURCE_DIR
}
/../
${
firmware_dir
}
/avr8_battery_monitor.hex
DESTINATION lib/firmware/iri/
${
PROJECT_NAME
}
)
DESTINATION lib/firmware/iri/
${
PROJECT_NAME
}
\ No newline at end of file
OPTIONAL
)
\ No newline at end of file
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