fixup

.github/workflows/clang_format.yml

@@ -3,50 +3,24 @@ name: Clang-Format
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-  schedule:
-    - cron: '0 5 * * *'
+
+  # allow manually starting this workflow
+  workflow_dispatch:
 
 jobs:
-  industrial_ci:
-    name: Format
-    runs-on: ubuntu-latest
-    env:
-      CI_NAME: Clang-Format
-      OS_NAME: ubuntu
-      OS_CODE_NAME: bionic
-      ROS_DISTRO: melodic
-      ROS_REPO: main
-      ROSDEP_SKIP_KEYS: "bullet bullet-extras opw_kinematics ros_industrial_cmake_boilerplate fcl ifopt benchmark"
-      CLANG_FORMAT_CHECK: file
-      CLANG_FORMAT_VERSION: 8
-      DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
+  clang_format:
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v1
 
-      - name: Free Disk Space
-        run: |
-          sudo swapoff -a
-          sudo rm -f /swapfile
-          sudo apt clean
-          docker rmi $(docker image ls -aq)
-          df -h
-
-      - name: Prepare ccache timestamp
-        id: ccache_cache_timestamp
-        shell: cmake -P {0}
+      - name: Run clang format
         run: |
-          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-          message("::set-output name=timestamp::${current_date}")
-
-      - name: ccache cache files
-        uses: actions/[email protected]
-        with:
-          path: ${{ env.CI_NAME }}/.ccache
-          key: ${{ env.CI_NAME }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: |
-            ${{ env.CI_NAME }}-ccache-
-
-      - uses: 'ros-industrial/industrial_ci@master'
-        env: ${{env}}
+          sudo apt update
+          sudo apt install -y git clang-format-8
+          if [ $? -ge 1 ]; then return 1; fi
+          ./.run-clang-format
+          if [ $? -ge 1 ]; then return 1; fi
+          output=$(git diff)
+          if [ -n "$output" ]; then exit 1; else exit 0; fi

.github/workflows/cmake_format.yml

@@ -3,21 +3,26 @@ name: CMake-Format
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
-  schedule:
-    - cron: '0 5 * * *'
+
+  # allow manually starting this workflow
+  workflow_dispatch:
 
 jobs:
   cmake_lang:
     name: Format
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Run CMake Lang Format Check
         run: |
           sudo pip3 install cmakelang
+          RED='\033[0;31m'
+          NC='\033[0m' # No Color
           ./.run-cmake-format
           output=$(git diff)
+          if [ -n "$output" ]; then printf "${RED}CMake format error: run script './.run-cmake-formate'${NC}\n"; fi
+          if [ -n "$output" ]; then printf "${RED}${output}${NC}\n"; fi
           if [ -n "$output" ]; then exit 1; else exit 0; fi

.github/workflows/ubuntu.yml

@@ -0,0 +1,39 @@
+name: Ubuntu
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  ci:
+    name: ${{ matrix.distro }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [focal, jammy]
+    container:
+      image: ghcr.io/tesseract-robotics/tesseract:${{ matrix.distro }}-0.21
+      env:
+        CCACHE_DIR: "$GITHUB_WORKSPACE/${{ matrix.distro }}/.ccache"
+        DEBIAN_FRONTEND: noninteractive
+        TZ: Etc/UTC
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          path: target_ws/src
+
+      - name: Build and Tests
+        uses: tesseract-robotics/colcon-action@v2
+        with:
+          before-script: source /opt/tesseract/install/setup.bash
+          ccache-prefix: ${{ matrix.distro }}
+          vcs-file: dependencies.repos
+          upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
+          target-path: target_ws/src
+          target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTRAJOPT_ENABLE_TESTING=ON

.github/workflows/unstable.yml

@@ -0,0 +1,46 @@
+name: Ubuntu
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  ci:
+    name: ${{ matrix.distro }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [focal, jammy]
+    container:
+      image: ghcr.io/tesseract-robotics/tesseract:${{ matrix.distro }}-master
+      env:
+        CCACHE_DIR: "$GITHUB_WORKSPACE/${{ matrix.distro }}/.ccache"
+        DEBIAN_FRONTEND: noninteractive
+        TZ: Etc/UTC
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          path: target_ws/sr
+
+      - name: Install Depends
+        shell: bash
+        run: |
+          apt update
+          apt upgrade -y
+          apt install -y clang-tidy
+
+      - name: Build and Tests
+        uses: tesseract-robotics/colcon-action@v2
+        with:
+          before-script: source /opt/tesseract/install/setup.bash
+          ccache-prefix: ${{ matrix.distro }}
+          vcs-file: dependencies.repos
+          upstream-args: --cmake-args -DCMAKE_BUILD_TYPE=Release
+          target-path: target_ws/src
+          target-args: --cmake-args -DCMAKE_BUILD_TYPE=Debug -DTRAJOPT_ENABLE_TESTING=ON -DTRAJOPT_ENABLE_CLANG_TIDY=ON