From d073e2d5403713868aeca7386a4e72dd0a294bb4 Mon Sep 17 00:00:00 2001 From: fherrero <fherrero@iri.upc.edu> Date: Tue, 12 May 2020 17:50:34 +0200 Subject: [PATCH] Add .gitignore and .gitlab-ci_template.yml, modifying new_project.sh script accordingly --- .gitignore | 3 +++ .gitlab-ci_template.yml | 40 ++++++++++++++++++++++++++++++++++++++++ new_project.sh | 3 +++ 3 files changed, 46 insertions(+) create mode 100644 .gitignore create mode 100644 .gitlab-ci_template.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ddaf48 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +bin +build +lib \ No newline at end of file diff --git a/.gitlab-ci_template.yml b/.gitlab-ci_template.yml new file mode 100644 index 0000000..6044eb9 --- /dev/null +++ b/.gitlab-ci_template.yml @@ -0,0 +1,40 @@ + image: docker.io/labrobotica/labrobotica + + variables: + GIT_SUBMODULE_STRATEGY: recursive + + stages: + - build + - test + - deploy + + build-package: + stage: build + script: + #- git submodule sync --recursive + #- git submodule update --init --recursive + - apt update + ##Install dependencies + #- apt -y install iri-iriutils-dev iri-comm-dev iri-dynamixel-dev + - mkdir -pv build + - cd build + - cmake -DCMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG .. + - ls .. + - make firmware -j $(nproc) + - make package -j $(nproc) + + artifacts: + paths: + - build/*.deb + expire_in: 2 weeks + only: + - tags + + update_repo: + stage: deploy + script: + - cd build + - "scp -i /root/.ssh/iriLabKeyNopwd -r *library-name*.deb irilabo@labrepo.iri.upc.edu:packages/" + - "ssh irilabo@labrepo.iri.upc.edu -i /root/.ssh/iriLabKeyNopwd -tt /home/irilabo/repo_scripts/update_repo.sh library-name" + only: + - tags \ No newline at end of file diff --git a/new_project.sh b/new_project.sh index 501e51d..017be3c 100755 --- a/new_project.sh +++ b/new_project.sh @@ -271,6 +271,8 @@ else rm application_src_template.cpp fi +sed 's/library-name/'$NEW_NAME_WITH_DASHES'/g' <.gitlab-ci_template.yml >./.gitlab-ci.yml + if [ $TEST = 1 ] then Library_name=$(echo $NAME | sed 's/\([a-zA-Z]\)\([a-zA-Z0-9]*\)/\u\1\2/g') @@ -288,5 +290,6 @@ rm driver_src_template.cpp rm driver_header_template.h rm driver_example_src_template.cpp rm Findlib_template.cmake +rm .gitlab-ci_template.yml rm new_project.sh rm -rf .git -- GitLab