From a5dbf9e280d6e70df0e2dd5b8d5485c8b8335284 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 5 Jan 2020 08:02:24 -0800 Subject: [PATCH 1/2] using common make action BB-776/common-make --- .github/actions/make@local/Dockerfile | 7 ------- .github/actions/make@local/action.yml | 6 ------ .github/actions/make@local/entrypoint.sh | 14 -------------- .github/workflows/story.yml | 2 +- 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 .github/actions/make@local/Dockerfile delete mode 100644 .github/actions/make@local/action.yml delete mode 100755 .github/actions/make@local/entrypoint.sh diff --git a/.github/actions/make@local/Dockerfile b/.github/actions/make@local/Dockerfile deleted file mode 100644 index fc19f4a..0000000 --- a/.github/actions/make@local/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM ros:kinetic-perception - -# Copies your code file from your action repository to the filesystem path `/` of the container -COPY entrypoint.sh /entrypoint.sh - -# Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/.github/actions/make@local/action.yml b/.github/actions/make@local/action.yml deleted file mode 100644 index 3c54845..0000000 --- a/.github/actions/make@local/action.yml +++ /dev/null @@ -1,6 +0,0 @@ -# action.yml -name: 'Make on Ros Kinetic Perception' -description: 'Standard cmake and make on ros:kinetic-perception' -runs: - using: 'docker' - image: 'Dockerfile' \ No newline at end of file diff --git a/.github/actions/make@local/entrypoint.sh b/.github/actions/make@local/entrypoint.sh deleted file mode 100755 index 0e37170..0000000 --- a/.github/actions/make@local/entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e # fail on error - -cd /github/workspace - -source /opt/ros/kinetic/setup.bash - -rm -rf build #clean the build -mkdir build -cd build -pwd -cmake .. -make \ No newline at end of file diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index a0410d1..57e85aa 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,5 +10,5 @@ jobs: steps: - uses: actions/checkout@v1 - name: make - uses: ./.github/actions/make@local + uses: AutoModality/action-make-ros@BB-776/common-make From d2a875e66240bf65e222695bfad89267bc4b2d77 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Sun, 5 Jan 2020 10:53:27 -0800 Subject: [PATCH 2/2] refactor: using common make github action BB-776/common-make --- .github/workflows/story.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 57e85aa..0ee41d4 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,5 +10,5 @@ jobs: steps: - uses: actions/checkout@v1 - name: make - uses: AutoModality/action-make-ros@BB-776/common-make + uses: AutoModality/action-make-ros@v1.0.0