Skip to content

Commit

Permalink
Merge pull request #7 from sonia-auv/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
kevincharbonneau authored Jul 13, 2020
2 parents d8058d6 + fcaf824 commit 2d2cc9a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/docker-image-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Build the docker image (robot based)
run: |
docker build . --tag build-${TARGET_VERSION}-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date ' +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
- name: Run Module Unit Test
run: |
docker run build-${TARGET_VERSION}-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} catkin_make run_tests
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Build the docker image (robot based)
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Login to Github Package Registry
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Build the docker image (perception based)
Expand Down Expand Up @@ -213,9 +213,9 @@ jobs:
- uses: actions/checkout@v2
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Login to Github Package Registry
run: |
echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
Expand All @@ -240,7 +240,8 @@ jobs:
notify-success:
name: "Notify Slack - Success"
runs-on: ubuntu-latest
needs: [
needs:
[
build-ros-robot-x86-64,
build-ros-robot-arm64,
build-ros-robot-l4t-arm64,
Expand All @@ -262,7 +263,8 @@ jobs:
notify-fail:
name: "Notify Slack - Failure"
runs-on: ubuntu-latest
needs: [
needs:
[
build-ros-robot-x86-64,
build-ros-robot-arm64,
build-ros-robot-l4t-arm64,
Expand All @@ -279,4 +281,4 @@ jobs:
with:
channel: github-ci-notifications
status: FAILED
color: danger
color: danger
8 changes: 4 additions & 4 deletions .github/workflows/docker-image-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Build the docker image (robot based)
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Login to Github Package Registry
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Build the docker image (perception based)
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Login to Github Package Registry
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-image-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Build the docker image (robot based)
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:

- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Login to Github Package Registry
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Build the docker image (perception based)
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:

- name: Install QEMU to be able to compile on X86 into ARM64
run: |
sudo apt-get install qemu binfmt-support qemu-user-static
sudo apt-get update && sudo apt-get install qemu binfmt-support qemu-user-static
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- name: Login to Github Package Registry
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ ENV SONIA_HOME=/home/${SONIA_USER}
ENV SONIA_UID=${SONIA_UID}
ENV ROS_WS_SETUP=/opt/ros/${ROS_DISTRO}/setup.bash

## ADD EXTRA DEPENDENCIES
RUN apt-get update && apt-get install -y libyaml-cpp-dev

## ENV FOR BASE LIB
ENV BASE_LIB_WS=${SONIA_HOME}/base_lib_ws
ENV BASE_LIB_WS_SETUP=${BASE_LIB_WS}/devel/setup.bash
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>sonia_msgs</name>
<version>1.0.0</version>
<version>1.0.1</version>
<description>sonia_msgs</description>
<maintainer email="[email protected]">Club SONIA</maintainer>
<license>GPLv3</license>
Expand Down

0 comments on commit 2d2cc9a

Please sign in to comment.