From cc64e7c2f725ba4f33a5811d13b9a13f560d13c4 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 25 Feb 2020 15:32:09 -0800 Subject: [PATCH 01/12] ci: fast build AM-23/fast-build --- .github/workflows/package.yml | 8 ++------ .github/workflows/release.yml | 2 +- .github/workflows/story.yml | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 2534a3f..94e6bf9 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -10,14 +10,10 @@ jobs: matrix: os: [ubuntu-18.04, [self-hosted,linux,arm64]] steps: - - name: Remove File - uses: JesseTG/rm@v1.0.0 - with: - path: '*' - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Package id: package - uses: AutoModality/action-package-debian-ros@v1.3.2 + uses: AutoModality/action-package-debian-ros@v2.0.0 with: branch: ${{ github.event.pull_request.head.ref }} pull-request-number: ${{ github.event.number }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ccb512..c5a9eb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,7 +64,7 @@ jobs: - name: Package if published if: steps.published.outputs.value == 'true' id: package - uses: AutoModality/action-package-debian-ros@v1.3.2 + uses: AutoModality/action-package-debian-ros@v2.0.0 with: version: ${{ steps.version.outputs.value }} release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 01b14ca..937fb7a 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -12,9 +12,9 @@ jobs: os: [ubuntu-18.04] fail-fast: true steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Package - uses: AutoModality/action-package-debian-ros@v1.3.2 + uses: AutoModality/action-package-debian-ros@v2.0.0 with: dev-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_DEV_ENTITLEMENT }} release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }} From 7642251a7fb4a6008501e407a2a2d36ba6715761 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 25 Feb 2020 15:44:46 -0800 Subject: [PATCH 02/12] fix: added uuid msgs as dependency AM-23/fast-build --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 3743962..f6c5f06 100644 --- a/debian/control +++ b/debian/control @@ -8,5 +8,5 @@ Standards-Version: 3.9.2 Package: ros-kinetic-am-utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-am-msgs +Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-am-msgs, ros-kinetic-uuid-msgs Description: The am utils package From a6496e025d40ce42e229ce44d7ab7cd778b1f26b Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 25 Feb 2020 15:56:33 -0800 Subject: [PATCH 03/12] allowd amd to continue with arm failure AM-23/fast-build --- .github/workflows/package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 94e6bf9..5852abc 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -9,6 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, [self-hosted,linux,arm64]] + fail-fast: false steps: - uses: actions/checkout@v2 - name: Package From 2d43fca2460fa6b78b944be61597ae6631d604f7 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:24:16 -0800 Subject: [PATCH 04/12] uuid-msgs added to build depends AM-23/fast-build --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f6c5f06..28c7884 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ros-kinetic-am-utils Section: misc Priority: extra Maintainer: info -Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-am-msgs +Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-am-msgs, ros-kinetic-uuid-msgs Homepage: https://github.com/AutoModality/am-utils Standards-Version: 3.9.2 From c083ba35e3e149d6dbcc061f2d87bee6bb21dfe0 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:35:07 -0800 Subject: [PATCH 05/12] trying to clean package directory to remove root owned files AM-23/fast-build --- .github/actions/clean@local/Dockerfile | 7 +++++++ .github/actions/clean@local/action.yml | 7 +++++++ .github/actions/clean@local/entrypoint.sh | 6 ++++++ .github/workflows/package.yml | 1 + 4 files changed, 21 insertions(+) create mode 100644 .github/actions/clean@local/Dockerfile create mode 100644 .github/actions/clean@local/action.yml create mode 100755 .github/actions/clean@local/entrypoint.sh diff --git a/.github/actions/clean@local/Dockerfile b/.github/actions/clean@local/Dockerfile new file mode 100644 index 0000000..29278e2 --- /dev/null +++ b/.github/actions/clean@local/Dockerfile @@ -0,0 +1,7 @@ +FROM alpine + +# 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/clean@local/action.yml b/.github/actions/clean@local/action.yml new file mode 100644 index 0000000..b772702 --- /dev/null +++ b/.github/actions/clean@local/action.yml @@ -0,0 +1,7 @@ +# see package.yml for usage +name: 'Clean' +description: 'Deletes all files in the work directory.' + +runs: + using: 'docker' + image: 'Dockerfile' diff --git a/.github/actions/clean@local/entrypoint.sh b/.github/actions/clean@local/entrypoint.sh new file mode 100755 index 0000000..d7a82f7 --- /dev/null +++ b/.github/actions/clean@local/entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -e # fail on error + +rm -rf * + diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5852abc..38a5c1d 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -11,6 +11,7 @@ jobs: os: [ubuntu-18.04, [self-hosted,linux,arm64]] fail-fast: false steps: + - uses: ./github/actions/clean@local - uses: actions/checkout@v2 - name: Package id: package From f1003b0fe21a91922c5113dfe5e20ad38cb8b37b Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:37:34 -0800 Subject: [PATCH 06/12] bad path to local action AM-23/fast-build --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 38a5c1d..3fd98e4 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -11,7 +11,7 @@ jobs: os: [ubuntu-18.04, [self-hosted,linux,arm64]] fail-fast: false steps: - - uses: ./github/actions/clean@local + - uses: .github/actions/clean@local - uses: actions/checkout@v2 - name: Package id: package From 64b3dd9d51a1f934073a951272a6822281fb25e0 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:43:06 -0800 Subject: [PATCH 07/12] temporiarly testing clean AM-23/fast-build --- .github/workflows/story.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 937fb7a..94f4c31 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -6,12 +6,9 @@ on: - master jobs: build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-18.04] - fail-fast: true + runs-on: self-hosted steps: + - uses: .github/actions/clean@local - uses: actions/checkout@v2 - name: Package uses: AutoModality/action-package-debian-ros@v2.0.0 From 0f5719e6ac26e8b48b23b77c32260bfa805e6308 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:45:37 -0800 Subject: [PATCH 08/12] path fixing AM-23/fast-build --- .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 94f4c31..3da5f6c 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: self-hosted steps: - - uses: .github/actions/clean@local + - uses: ./.github/actions/clean@local - uses: actions/checkout@v2 - name: Package uses: AutoModality/action-package-debian-ros@v2.0.0 From 2766366511f267c80801d9ac7806671362405b54 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:51:47 -0800 Subject: [PATCH 09/12] trying the rm action again AM-23/fast-build --- .github/workflows/story.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 3da5f6c..863d349 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -8,7 +8,9 @@ jobs: build: runs-on: self-hosted steps: - - uses: ./.github/actions/clean@local + - uses: JesseTG/rm + with: + path: '*' - uses: actions/checkout@v2 - name: Package uses: AutoModality/action-package-debian-ros@v2.0.0 From 8f18033cf2d3b75aa95b789a496195df44b56925 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 20:58:16 -0800 Subject: [PATCH 10/12] using a docker action to clean AM-23/fast-build --- .github/actions/clean@local/Dockerfile | 7 ------- .github/actions/clean@local/action.yml | 7 ------- .github/actions/clean@local/entrypoint.sh | 6 ------ .github/workflows/story.yml | 4 +--- 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .github/actions/clean@local/Dockerfile delete mode 100644 .github/actions/clean@local/action.yml delete mode 100755 .github/actions/clean@local/entrypoint.sh diff --git a/.github/actions/clean@local/Dockerfile b/.github/actions/clean@local/Dockerfile deleted file mode 100644 index 29278e2..0000000 --- a/.github/actions/clean@local/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM alpine - -# 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/clean@local/action.yml b/.github/actions/clean@local/action.yml deleted file mode 100644 index b772702..0000000 --- a/.github/actions/clean@local/action.yml +++ /dev/null @@ -1,7 +0,0 @@ -# see package.yml for usage -name: 'Clean' -description: 'Deletes all files in the work directory.' - -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/clean@local/entrypoint.sh b/.github/actions/clean@local/entrypoint.sh deleted file mode 100755 index d7a82f7..0000000 --- a/.github/actions/clean@local/entrypoint.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e # fail on error - -rm -rf * - diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 863d349..90320b2 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -8,9 +8,7 @@ jobs: build: runs-on: self-hosted steps: - - uses: JesseTG/rm - with: - path: '*' + - uses: AutoModality/action-clean@master - uses: actions/checkout@v2 - name: Package uses: AutoModality/action-package-debian-ros@v2.0.0 From 511c0b4348cee9d2674c2342f90fae8541bad336 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 21:13:21 -0800 Subject: [PATCH 11/12] added clean for self hosted. BB-809 AM-23/fast-build --- .github/workflows/package.yml | 2 +- .github/workflows/story.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 3fd98e4..e0b295c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -11,7 +11,7 @@ jobs: os: [ubuntu-18.04, [self-hosted,linux,arm64]] fail-fast: false steps: - - uses: .github/actions/clean@local + - uses: AutoModality/action-clean@v1 - uses: actions/checkout@v2 - name: Package id: package diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 90320b2..630c11a 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -8,7 +8,6 @@ jobs: build: runs-on: self-hosted steps: - - uses: AutoModality/action-clean@master - uses: actions/checkout@v2 - name: Package uses: AutoModality/action-package-debian-ros@v2.0.0 From 863eed33bbc738e126eed602d91c290df04a18d4 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Wed, 26 Feb 2020 21:14:33 -0800 Subject: [PATCH 12/12] forgot to change back to hosted AM-23/fast-build --- .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 630c11a..16f38ff 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -6,7 +6,7 @@ on: - master jobs: build: - runs-on: self-hosted + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Package