Merge pull request #6 from westonrobot/next

v2.0.0

.github/workflows/default.yml

@@ -13,16 +13,15 @@ jobs:
   build:
     strategy:
       matrix:
-        container: ["westonrobot/ros:melodic-ci", "westonrobot/ros:noetic-ci"]
-        runner: [[self-hosted, Linux, X64], [self-hosted, Linux, ARM64]]
+        container: ["westonrobot/ros:noetic-ci-latest"]
+        runner: ["ubuntu-latest"]
     runs-on: ${{ matrix.runner}}
     container:
       image: ${{ matrix.container }}
     defaults:
       run:
         shell: bash
     steps:
-      - uses:  westonrobot-dev/action-cleanup@master
       - name: Upgrade git if on Ubuntu 18.04
         if: |
           contains(matrix.container, 'bionic') || contains(matrix.container, 'zephyr') || contains(matrix.container, 'melodic')
@@ -36,28 +35,39 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          ssh-key: ${{ secrets.GIT_REPO_SSH_KEY }}
           submodules: recursive
           path: "catkin_ws/src/"
-      - name: Install latest wrp_sdk
+      - name: Install boost
         run: |
-          echo "deb https://westonrobot.jfrog.io/artifactory/wrtoolbox-release $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/weston-robot.list
-          echo "deb https://westonrobot.jfrog.io/artifactory/wrtoolbox-release $(lsb_release -cs) next" >> /etc/apt/sources.list.d/weston-robot.list
-          curl -sSL 'https://westonrobot.jfrog.io/artifactory/api/security/keypair/wr-deb/public' | apt-key add -
-          apt-get update && apt-get -y install wrp_sdk
+          apt-get update && apt-get -y install libboost-all-dev
+      - name: Install latest stable wrp_sdk
+        run: |
+          sudo apt-get update
+          sudo install -m 0755 -d /etc/apt/keyrings
+          curl -fsSL http://deb.westonrobot.net/signing.key | sudo gpg --batch --yes --dearmor -o /etc/apt/keyrings/weston-robot.gpg
+          sudo chmod a+r /etc/apt/keyrings/weston-robot.gpg
+          echo \
+              "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/weston-robot.gpg] http://deb.westonrobot.net/$(lsb_release -cs) $(lsb_release -cs) main" | \
+              sudo tee /etc/apt/sources.list.d/weston-robot.list > /dev/null
+          apt-get update && apt-get -y install wrp-sdk
       - name: Install latest lely-can
         run: |
           add-apt-repository ppa:lely/ppa
           apt-get update && apt-get -y install pkg-config liblely-coapp-dev liblely-co-tools
       - name: Install ROS dependencies
         run: |
+          apt-get install -y python3-rosdep
+          if [ ! -e /etc/ros/rosdep/sources.list.d/20-default.list ]; then rosdep init; fi
           cd ${GITHUB_WORKSPACE}/catkin_ws
           source /opt/ros/${ROS_DISTRO}/setup.bash
           rosdep update
-          rosdep install -y --ignore-src --from-paths src --rosdistro ${ROS_DISTRO} --skip-keys wrp_sdk --skip-keys wrp_zbus
-          apt-get update && apt-get install -y ros-${ROS_DISTRO}-message-generation ros-${ROS_DISTRO}-tf2*
+          rosdep install -y -r --ignore-src --from-paths src --rosdistro ${ROS_DISTRO}
       - name: Catkin make
         run: |
           cd ${GITHUB_WORKSPACE}/catkin_ws
           source /opt/ros/${ROS_DISTRO}/setup.bash && catkin_make
-          
+      - name: Catkin make isolated
+        run: |
+          cd ${GITHUB_WORKSPACE}/catkin_ws
+          rm -r devel/ build/
+          source /opt/ros/${ROS_DISTRO}/setup.bash && catkin_make_isolated

.github/workflows/release-github.yml

@@ -0,0 +1,26 @@
+name: release-github
+
+on:
+  push:
+    tags:
+      - "*"
+  workflow_dispatch:
+
+env:
+  CONAN_USER: ${{ secrets.ARTIFACTORY_CONAN_USERNAME }}
+  CONAN_TOKEN: ${{ secrets.ARTIFACTORY_CONAN_ACCESS_TOKEN }}
+
+jobs:
+  release:
+    runs-on: ["ubuntu-latest"]
+    container: "westonrobot/ubuntu:focal-ci-latest"
+    defaults:
+      run:
+        shell: bash
+    permissions:
+      contents: write
+    steps:
+      - name: Create release
+        uses: westonrobot-dev/release-action@v1.13.0
+        with:
+          generateReleaseNotes: true

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: release
+
+on:
+  push:
+    branches:
+      - "main"
+
+env:
+  VERSION: 2.0.0
+
+jobs:
+  tag-release:
+    runs-on: ["ubuntu-latest"]
+    container: "westonrobot/ubuntu:focal-ci-latest"
+    steps:
+      - name: Create tag
+        continue-on-error: true
+        if: github.ref_name == 'main'
+        uses: westonrobot-dev/github-tag-action@v6.1
+        id: tag_version
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          custom_tag: ${{ env.VERSION }}
+          release_branches: "main"
+          pre_release_branches: "prerelease"
+      - name: Create Github Release
+        if: github.ref_name == 'main' && steps.tag_version.outcome == 'success'
+        uses: westonrobot-dev/workflow-dispatch@v1.2.2
+        with:
+          workflow: release-github.yml
+          ref: ${{ steps.tag_version.outputs.new_tag }}