From ee94623176262f3bc34ac3555054092b454d2289 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 13:42:12 +0200 Subject: [PATCH 01/43] (actions) use container --- .github/workflows/main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd8e4ff18..a818319e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,7 @@ jobs: name: ${{ matrix.ros_distro }} if: ${{ github.actor != 'RWT-bot' }} runs-on: ubuntu-latest + container: ros:${{ matrix.ros_distro }}-ros-core strategy: fail-fast: false matrix: @@ -18,12 +19,16 @@ jobs: TOKEN: "${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' && secrets.RWT_BOT_PAT || github.token }}" with: token: ${{ env.TOKEN }} - - name: Docker pull - run: docker pull ros:${{ matrix.ros_distro }}-ros-core - - name: Docker build - run: docker build --build-arg ROS_DISTRO="${{ matrix.ros_distro }}" --build-arg NODE_VERSION="${{ matrix.node_version }}" -t roslibjsdocker . + - uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node_version }} + - name: Install apt dependencies + env: + ROS_DISTRO: ${{ matrix.ros_distro }} + run: | + apt-get update && apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests - run: docker run -v $(pwd):/root/roslibjs --rm roslibjsdocker bash -i -c 'bash /root/roslibjs/test/build.bash' + run: source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash' - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 5e75f1a0e8c300146c810ade8c321251c9d8e387 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 13:44:34 +0200 Subject: [PATCH 02/43] Update main.yml --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a818319e7..a84fd3e18 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,9 +26,12 @@ jobs: env: ROS_DISTRO: ${{ matrix.ros_distro }} run: | - apt-get update && apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials + apt-get update + apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests - run: source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash' + run: | + source /opt/ros/$ROS_DISTRO/setup.bash + test/build.bash - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 73dd3665b099f34d4b4651b940f13d29700abe2e Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 13:47:57 +0200 Subject: [PATCH 03/43] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a84fd3e18..e970711d3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,6 +13,8 @@ jobs: matrix: ros_distro: [melodic, noetic] node_version: [14] + env: + ROS_DISTRO: ${{ matrix.ros_distro }} steps: - uses: actions/checkout@v3 env: @@ -23,8 +25,6 @@ jobs: with: node-version: ${{ matrix.node_version }} - name: Install apt dependencies - env: - ROS_DISTRO: ${{ matrix.ros_distro }} run: | apt-get update apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials From a4a603ecc615ab297effc37125f9883ef34076c8 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 13:51:27 +0200 Subject: [PATCH 04/43] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e970711d3..2bb28366e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,8 @@ jobs: apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | + ls -la /opt/ros + ls -la /opt/ros/$ROS_DISTRO source /opt/ros/$ROS_DISTRO/setup.bash test/build.bash - uses: stefanzweifel/git-auto-commit-action@v4 From dd80647a0fffb7ea17c67be0f6009f897800f071 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 13:56:04 +0200 Subject: [PATCH 05/43] Update main.yml --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2bb28366e..eab472e02 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,6 +2,10 @@ name: CI on: [push, pull_request] +defaults: + run: + shell: bash + jobs: ci: name: ${{ matrix.ros_distro }} @@ -30,8 +34,6 @@ jobs: apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | - ls -la /opt/ros - ls -la /opt/ros/$ROS_DISTRO source /opt/ros/$ROS_DISTRO/setup.bash test/build.bash - uses: stefanzweifel/git-auto-commit-action@v4 From c713f8f8f48aded5700b4323eb473ceff37e09f6 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 14:00:10 +0200 Subject: [PATCH 06/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eab472e02..538553ce1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: - name: Tests run: | source /opt/ros/$ROS_DISTRO/setup.bash - test/build.bash + bash test/build.bash - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 9bd223510f9721b4f3860005cd10630ffe24b7e7 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Fri, 3 Jun 2022 14:12:06 +0200 Subject: [PATCH 07/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 538553ce1..b2c42cf02 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - name: Install apt dependencies run: | apt-get update - apt-get install -y ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials + apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | source /opt/ros/$ROS_DISTRO/setup.bash From 1ee38f63b4e206c0ad1ac6efc84565473d433577 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 19:20:57 +0200 Subject: [PATCH 08/43] (actions) don't run as root https://github.community/t/how-to-run-action-as-a-non-root-user/17572 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2c42cf02..f25b05858 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,6 +12,7 @@ jobs: if: ${{ github.actor != 'RWT-bot' }} runs-on: ubuntu-latest container: ros:${{ matrix.ros_distro }}-ros-core + options: --user 1001 strategy: fail-fast: false matrix: From 9c12633d508a3c3bee0169aab86250cd5755347a Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 19:27:40 +0200 Subject: [PATCH 09/43] (actions) fix syntax https://github.community/t/how-to-run-action-as-a-non-root-user/17572 --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f25b05858..d9f8c5b82 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,8 +11,9 @@ jobs: name: ${{ matrix.ros_distro }} if: ${{ github.actor != 'RWT-bot' }} runs-on: ubuntu-latest - container: ros:${{ matrix.ros_distro }}-ros-core - options: --user 1001 + container: + image: ros:${{ matrix.ros_distro }}-ros-core + options: --user 1001 strategy: fail-fast: false matrix: From ae7e196aa5f4584b5f3b7869935575ad7e970f95 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 19:44:20 +0200 Subject: [PATCH 10/43] (actions) apt needs sudo with other user --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9f8c5b82..2d5b62beb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,8 +32,8 @@ jobs: node-version: ${{ matrix.node_version }} - name: Install apt dependencies run: | - apt-get update - apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials + sudo apt-get update + sudo apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | source /opt/ros/$ROS_DISTRO/setup.bash From 9b417174d2421e458c32e35808ee2e688d9f5ca1 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 20:42:03 +0200 Subject: [PATCH 11/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d5b62beb..6ba445e45 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest container: image: ros:${{ matrix.ros_distro }}-ros-core - options: --user 1001 + options: --user 1001:root strategy: fail-fast: false matrix: From 1ef6414593271604c5ddec1438c88acb525f126e Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 20:56:21 +0200 Subject: [PATCH 12/43] Update main.yml --- .github/workflows/main.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ba445e45..26e63284a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,7 @@ jobs: name: ${{ matrix.ros_distro }} if: ${{ github.actor != 'RWT-bot' }} runs-on: ubuntu-latest - container: - image: ros:${{ matrix.ros_distro }}-ros-core - options: --user 1001:root + container: ros:${{ matrix.ros_distro }}-ros-core strategy: fail-fast: false matrix: @@ -32,12 +30,12 @@ jobs: node-version: ${{ matrix.node_version }} - name: Install apt dependencies run: | - sudo apt-get update - sudo apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials + apt-get update + apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | source /opt/ros/$ROS_DISTRO/setup.bash - bash test/build.bash + sudo -H -u 1001 bash test/build.bash - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 92a7f0c81000155fe6a0bcb49c286cf906a16960 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 21:00:07 +0200 Subject: [PATCH 13/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26e63284a..942df51f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: - name: Tests run: | source /opt/ros/$ROS_DISTRO/setup.bash - sudo -H -u 1001 bash test/build.bash + sudo -H bash test/build.bash - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 2f6d9509d9ec555a5ed619c80eeab81efa2ac0be Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sat, 4 Jun 2022 23:32:07 +0200 Subject: [PATCH 14/43] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 942df51f6..49e4a54f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,8 +34,7 @@ jobs: apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | - source /opt/ros/$ROS_DISTRO/setup.bash - sudo -H bash test/build.bash + sudo -H bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && source test/build.bash" - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From f097256c85c7697f22008679f07faf6a83d5980a Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 5 Jun 2022 14:07:38 +0200 Subject: [PATCH 15/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 49e4a54f4..a064105bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | - sudo -H bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && source test/build.bash" + sudo -H bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 4f81dbf774b31379da133a0834d1c7436f357bc6 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 10:58:53 +0200 Subject: [PATCH 16/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a064105bf..9d4d5c290 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | - sudo -H bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" + sudo bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 00ad92ef136756644b16e69517e1b1913f135d4b Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:01:47 +0200 Subject: [PATCH 17/43] Update main.yml --- .github/workflows/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d4d5c290..e7e1c7701 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,10 +2,6 @@ name: CI on: [push, pull_request] -defaults: - run: - shell: bash - jobs: ci: name: ${{ matrix.ros_distro }} From bf41bda761bb6f1976445e5e991a04e079c0919c Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:05:37 +0200 Subject: [PATCH 18/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index 3578edc4e..e50b36f52 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -3,6 +3,9 @@ if command -v rosrun 2>/dev/null then echo "Shutting everything down" + echo 'pgrep -f "[r]os"' + pgrep -f "[r]os" + echo 'pgrep -f "[r]os" | xargs kill -9' pgrep -f "[r]os" | xargs kill -9 sleep 1 From e14c408f9ea770617a6417f0245bd8387f41146a Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:15:29 +0200 Subject: [PATCH 19/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index e50b36f52..c0b8681b9 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -3,6 +3,7 @@ if command -v rosrun 2>/dev/null then echo "Shutting everything down" + echo "PID of this script: $$" echo 'pgrep -f "[r]os"' pgrep -f "[r]os" echo 'pgrep -f "[r]os" | xargs kill -9' From 7b11fde2b2bcdff0afc0b8c280d90f135b1ab06d Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:19:16 +0200 Subject: [PATCH 20/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index c0b8681b9..682447169 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -18,8 +18,9 @@ then do echo "Waiting for /hello_world_publisher...$i" sleep 1 - rostopic info /listener > /dev/null && LAUNCHED=true && break + rostopic info /listener > /dev/null && LAUNCHED=true && echo "break" && break done + echo "end of loop" if [ $LAUNCHED == true ] then echo "Ready for lift off" From d34dd910b939bda00e99d774138e5973f0ceac90 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:22:36 +0200 Subject: [PATCH 21/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index 682447169..55f112c97 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -18,6 +18,9 @@ then do echo "Waiting for /hello_world_publisher...$i" sleep 1 + echo "end of sleep" + rostopic info /listener + echo "end of 'rostopic info /listener'" rostopic info /listener > /dev/null && LAUNCHED=true && echo "break" && break done echo "end of loop" From 450e74fafad21aa08defbdf30d40451db400c4d2 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:30:40 +0200 Subject: [PATCH 22/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index 55f112c97..04ad5cac6 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -17,6 +17,9 @@ then for i in {1..10} do echo "Waiting for /hello_world_publisher...$i" + echo "mem usage" + pgrep -f "[r]os" | xargs top -p + echo "start op sleep" sleep 1 echo "end of sleep" rostopic info /listener From 558ab011dbb9072a0c4517c9380bba977eb21305 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:41:37 +0200 Subject: [PATCH 23/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index 04ad5cac6..806426417 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -17,6 +17,8 @@ then for i in {1..10} do echo "Waiting for /hello_world_publisher...$i" + echo 'pgrep -f "[r]os"' + pgrep -f "[r]os" echo "mem usage" pgrep -f "[r]os" | xargs top -p echo "start op sleep" From 10f13b36ff177c274d983879fb787266322e365c Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 11:50:48 +0200 Subject: [PATCH 24/43] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7e1c7701..77b614e63 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,6 +2,9 @@ name: CI on: [push, pull_request] +defaults: + run: bash + jobs: ci: name: ${{ matrix.ros_distro }} From 82b15f382ee2ee3c5fda2558d5bbbd1c83f72f96 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 12:04:27 +0200 Subject: [PATCH 25/43] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77b614e63..9d4d5c290 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,8 @@ name: CI on: [push, pull_request] defaults: - run: bash + run: + shell: bash jobs: ci: From 4fe2f7a9466d7d750e172ec677cfb175a29a32ff Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 13:41:44 +0200 Subject: [PATCH 26/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index 806426417..ec27c2184 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -20,6 +20,7 @@ then echo 'pgrep -f "[r]os"' pgrep -f "[r]os" echo "mem usage" + export TERM=linux pgrep -f "[r]os" | xargs top -p echo "start op sleep" sleep 1 From 33f7b6663ea8f38be567db4b5921964ae88b639a Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 14:35:37 +0200 Subject: [PATCH 27/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index ec27c2184..a00de95f4 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -7,7 +7,7 @@ then echo 'pgrep -f "[r]os"' pgrep -f "[r]os" echo 'pgrep -f "[r]os" | xargs kill -9' - pgrep -f "[r]os" | xargs kill -9 + # pgrep -f "[r]os" | xargs kill -9 sleep 1 echo "Starting roscore and various examples in background processes" From 96459af7c371a855f1accbf7e2e023b56dd42fd1 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 14:41:20 +0200 Subject: [PATCH 28/43] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d4d5c290..a064105bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | - sudo bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" + sudo -H bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From d8f32e34696062daf4b82aff52da1fc694d9234f Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 6 Jun 2022 15:56:00 +0200 Subject: [PATCH 29/43] Update setup_examples.bash --- test/examples/setup_examples.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index a00de95f4..1daeda89b 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -6,8 +6,10 @@ then echo "PID of this script: $$" echo 'pgrep -f "[r]os"' pgrep -f "[r]os" + echo "ps -aux" + ps -aux echo 'pgrep -f "[r]os" | xargs kill -9' - # pgrep -f "[r]os" | xargs kill -9 + pgrep -f "roslaunch" | xargs kill -9 sleep 1 echo "Starting roscore and various examples in background processes" From 2588430049015608b2fb290267e7f84d3b928ff2 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 10:03:12 +0200 Subject: [PATCH 30/43] [temp] (actions)get node version --- .github/workflows/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a064105bf..21e2fd1d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,15 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} + - name: get node version + run: | + node --version; npm --version; which -a node; echo $PATH + - name: get node version sudo + run: | + sudo node --version; sudo npm --version; sudo which -a node; sudo echo $PATH + - name: get node version sudo -H + run: | + sudo -H node --version; sudo -H npm --version; sudo -H which -a node; sudo -H echo $PATH - name: Install apt dependencies run: | apt-get update From 6524fb3c371afe7ede2ac4ca4949c6a2d1260a3e Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 10:08:57 +0200 Subject: [PATCH 31/43] (actions) don't use when calling NPM --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 21e2fd1d5..9c378429f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: apt-get install -y firefox ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - name: Tests run: | - sudo -H bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" + bash -c "source /opt/ros/$ROS_DISTRO/setup.bash && bash test/build.bash" - uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ github.event_name == 'push' && endsWith(github.ref, 'develop') && matrix.ros_distro == 'noetic' }} with: From 8fcee514e3a403b450611beaceec2c4030e3fbde Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 10:09:50 +0200 Subject: [PATCH 32/43] (actions) remove get node version sudo --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c378429f..7e1fb4bba 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,9 +31,6 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH - - name: get node version sudo - run: | - sudo node --version; sudo npm --version; sudo which -a node; sudo echo $PATH - name: get node version sudo -H run: | sudo -H node --version; sudo -H npm --version; sudo -H which -a node; sudo -H echo $PATH From a43fbb52cf4c0a61d659fa289a22b371a01d02ce Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 10:11:17 +0200 Subject: [PATCH 33/43] (actions) remove get node version sudo -H --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e1fb4bba..972e02e3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,9 +31,6 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH - - name: get node version sudo -H - run: | - sudo -H node --version; sudo -H npm --version; sudo -H which -a node; sudo -H echo $PATH - name: Install apt dependencies run: | apt-get update From f040af8488a0df01c2495f541f197bb0c06ea143 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 10:34:53 +0200 Subject: [PATCH 34/43] Update main.yml --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 972e02e3f..bd167ccf6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,9 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH + - name: whoami + run: | + whoami - name: Install apt dependencies run: | apt-get update From 385d376174adc35e1ecd90f863adac5c5ce25efa Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 11:16:15 +0200 Subject: [PATCH 35/43] (actions) ll /github --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd167ccf6..cf783cc6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,9 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH + - name: ll /github + run: | + ll /github - name: whoami run: | whoami From eef73e144b042819fcf0399b62f991e814b85907 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 11:18:31 +0200 Subject: [PATCH 36/43] (actions) ll -> ls -alF --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf783cc6d..97e0711ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,9 +31,9 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH - - name: ll /github + - name: ls -alF /github run: | - ll /github + ls -alF /github - name: whoami run: | whoami From 1be74034562204d258238173bf0ea5f7d9d121d9 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 11:29:17 +0200 Subject: [PATCH 37/43] (actions) own /github --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97e0711ac..1bef08d08 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,9 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH + - name: Own /github + run: | + chown -hR root:root /github - name: ls -alF /github run: | ls -alF /github From 3bbc2a3ad7dc70a4e7d6a35e9d4f7e5c5ec6bc5e Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 11:35:14 +0200 Subject: [PATCH 38/43] Update main.yml --- .github/workflows/main.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1bef08d08..e0159d850 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,15 +31,21 @@ jobs: - name: get node version run: | node --version; npm --version; which -a node; echo $PATH - - name: Own /github - run: | - chown -hR root:root /github - name: ls -alF /github run: | ls -alF /github - - name: whoami + - name: ls -alF /github/home run: | - whoami + ls -alF /github/home + - name: ls -alF /github/workflow + run: | + ls -alF /github/workflow + - name: Own /github + run: | + chown -hR $(whoami):$(whoami) /github/home + - name: ls -alF /github2 + run: | + ls -alF /github - name: Install apt dependencies run: | apt-get update From c547b9626f955a6e929522eceeddf3ea0619f105 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 11:41:51 +0200 Subject: [PATCH 39/43] (actions) cleanup --- .github/workflows/main.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e0159d850..236bc07b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,19 +28,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} - - name: get node version - run: | - node --version; npm --version; which -a node; echo $PATH - - name: ls -alF /github - run: | - ls -alF /github - - name: ls -alF /github/home - run: | - ls -alF /github/home - - name: ls -alF /github/workflow - run: | - ls -alF /github/workflow - - name: Own /github + - name: Own /github/home run: | chown -hR $(whoami):$(whoami) /github/home - name: ls -alF /github2 From 4fabe2cfc3c7f0409a1397b11b52570cd682f569 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Sun, 14 Aug 2022 12:01:16 +0200 Subject: [PATCH 40/43] (setup_examples) cleanup --- test/examples/setup_examples.bash | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index 1daeda89b..c4a779dc9 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -3,13 +3,7 @@ if command -v rosrun 2>/dev/null then echo "Shutting everything down" - echo "PID of this script: $$" - echo 'pgrep -f "[r]os"' - pgrep -f "[r]os" - echo "ps -aux" - ps -aux - echo 'pgrep -f "[r]os" | xargs kill -9' - pgrep -f "roslaunch" | xargs kill -9 + pgrep -f "[r]os" | xargs kill -9 sleep 1 echo "Starting roscore and various examples in background processes" @@ -19,16 +13,7 @@ then for i in {1..10} do echo "Waiting for /hello_world_publisher...$i" - echo 'pgrep -f "[r]os"' - pgrep -f "[r]os" - echo "mem usage" - export TERM=linux - pgrep -f "[r]os" | xargs top -p - echo "start op sleep" sleep 1 - echo "end of sleep" - rostopic info /listener - echo "end of 'rostopic info /listener'" rostopic info /listener > /dev/null && LAUNCHED=true && echo "break" && break done echo "end of loop" From 1eb652d385793c28813af1fba8973211a6c700b7 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 15 Aug 2022 14:20:56 +0200 Subject: [PATCH 41/43] (actions) remove ls --- .github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 236bc07b1..71c02b806 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,9 +31,6 @@ jobs: - name: Own /github/home run: | chown -hR $(whoami):$(whoami) /github/home - - name: ls -alF /github2 - run: | - ls -alF /github - name: Install apt dependencies run: | apt-get update From 0f152af6606a3cd57077dd25ceec347dcacea759 Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 15 Aug 2022 14:22:11 +0200 Subject: [PATCH 42/43] (test) remove prints --- test/examples/setup_examples.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/examples/setup_examples.bash b/test/examples/setup_examples.bash index c4a779dc9..3578edc4e 100644 --- a/test/examples/setup_examples.bash +++ b/test/examples/setup_examples.bash @@ -14,9 +14,8 @@ then do echo "Waiting for /hello_world_publisher...$i" sleep 1 - rostopic info /listener > /dev/null && LAUNCHED=true && echo "break" && break + rostopic info /listener > /dev/null && LAUNCHED=true && break done - echo "end of loop" if [ $LAUNCHED == true ] then echo "Ready for lift off" From 2aec10281bd1104f8c9980cd7488d57403a01ddb Mon Sep 17 00:00:00 2001 From: Matthijs van der Burgh Date: Mon, 15 Aug 2022 15:02:56 +0200 Subject: [PATCH 43/43] Delete Dockerfile --- Dockerfile | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 72760187a..000000000 --- a/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -ARG ROS_DISTRO=melodic -FROM ros:$ROS_DISTRO-ros-core - -ARG CI=true -ENV CI=$CI - -# Dependencies for rosbridge -RUN apt update && apt-get install -y firefox git wget ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials - -# Install nvm, Node.js and node-gyp -ARG NODE_VERSION=14 -RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash \ - && . $HOME/.nvm/nvm.sh \ - && nvm install $NODE_VERSION && nvm alias default $NODE_VERSION \ - && npm install -g node-gyp - -RUN echo "source /opt/ros/$ROS_DISTRO/setup.bash" >> $HOME/.bashrc -ENV PATH=/bin/versions/node/$NODE_VERSION/bin:$PATH