From 15986f445170f169d2873a6f97de8710929b561f Mon Sep 17 00:00:00 2001
From: flipflip <flipflip@fixposition.com>
Date: Tue, 16 Jul 2024 18:11:10 +0200
Subject: [PATCH] Use pre-made docker images for CI, use ROS Noetic, Humble and
 Jazzy (remove Melodic and Foxy)

---
 .github/workflows/build_test_ros.yml  | 42 +++++++++++++--------------
 .github/workflows/build_test_ros2.yml | 30 +++++++++----------
 CHANGELOG.md                          |  4 +++
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build_test_ros.yml b/.github/workflows/build_test_ros.yml
index 026253b..7b3b5a6 100644
--- a/.github/workflows/build_test_ros.yml
+++ b/.github/workflows/build_test_ros.yml
@@ -15,16 +15,16 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: "melodic"
-            container:
-              image: "osrf/ros:melodic-desktop-full"
-              env:
-                ROS_DISTRO: melodic
+          # - name: "melodic"
+          #   container:
+          #     image: "osrf/ros:melodic-desktop-full"
+          #     env:
+          #       ROS_DISTRO: melodic
           - name: "noetic"
             container:
-              image: "osrf/ros:noetic-desktop-full"
-              env:
-                ROS_DISTRO: noetic
+              image: "ghcr.io/fixposition/fixposition/fixposition-sdk:noetic-ci"
+              # env:
+              #   ROS_DISTRO: noetic
 
     container: ${{ matrix.config.container }}
 
@@ -33,25 +33,25 @@ jobs:
         shell: bash
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: src/fixposition_driver
       - name: Checkout Deps
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: fixposition/fixposition_gnss_tf
           path: src/fixposition_gnss_tf
-      - name: Set up Deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libeigen3-dev libyaml-cpp-dev libgtest-dev python3-osrf-pycommon python3-catkin-tools
-      - name: Install Gtest
-        if: matrix.config.container.image == 'osrf/ros:melodic-desktop-full'
-        run: |
-          cd /usr/src/gtest
-          sudo cmake .
-          sudo make
-          sudo make install
+      # - name: Set up Deps
+      #   run: |
+      #     sudo apt-get update
+      #     sudo apt-get install -y libeigen3-dev libyaml-cpp-dev libgtest-dev python3-osrf-pycommon python3-catkin-tools
+      # - name: Install Gtest
+      #   if: matrix.config.container.image == 'osrf/ros:melodic-desktop-full'
+      #   run: |
+      #     cd /usr/src/gtest
+      #     sudo cmake .
+      #     sudo make
+      #     sudo make install
       - name: Ignore ROS2 node
         run: |
           touch src/fixposition_driver/fixposition_driver_ros2/CATKIN_IGNORE
diff --git a/.github/workflows/build_test_ros2.yml b/.github/workflows/build_test_ros2.yml
index 0111191..49321d2 100644
--- a/.github/workflows/build_test_ros2.yml
+++ b/.github/workflows/build_test_ros2.yml
@@ -17,14 +17,14 @@ jobs:
         config:
           - name: "humble"
             container:
-              image: "osrf/ros:humble-desktop-full"
-              env:
-                ROS_DISTRO: humble
-          - name: "foxy"
+              image: "ghcr.io/fixposition/fixposition/fixposition-sdk:humble-ci"
+              # env:
+              #   ROS_DISTRO: humble
+          - name: "jazzy"
             container:
-              image: "osrf/ros:foxy-desktop"
-              env:
-                ROS_DISTRO: foxy
+              image: "ghcr.io/fixposition/fixposition/fixposition-sdk:jazzy-ci"
+              # env:
+              #   ROS_DISTRO: foxy
 
     container: ${{ matrix.config.container }}
 
@@ -33,22 +33,22 @@ jobs:
         shell: bash
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: src/fixposition_driver
       - name: Checkout Deps
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: fixposition/fixposition_gnss_tf
-          path: src/fixposition_gnss_tf    
+          path: src/fixposition_gnss_tf
       - name: Set up Deps
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libeigen3-dev libyaml-cpp-dev libgtest-dev python3-osrf-pycommon
+        # run: |
+        #   sudo apt-get update
+        #   sudo apt-get install -y libeigen3-dev libyaml-cpp-dev libgtest-dev python3-osrf-pycommon
       - name: Ignore ROS1 node
         run: |
-          touch src/fixposition_driver/fixposition_driver_ros1/COLCON_IGNORE      
-          touch src/fixposition_driver/fixposition_odometry_converter_ros1/COLCON_IGNORE    
+          touch src/fixposition_driver/fixposition_driver_ros1/COLCON_IGNORE
+          touch src/fixposition_driver/fixposition_odometry_converter_ros1/COLCON_IGNORE
       - name: Build and Test
         run: |
           source /opt/ros/$ROS_DISTRO/setup.bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f8688e..ba6b66b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 _For questions about compatibility, please contact Fixpositions Support support@fixposition.com_
 
+## x.x.x
+
+    - Remove support and CI for ROS 1 Melodic and ROS 2 Foxy
+
 ## [6.1.3](https://github.com/fixposition/fixposition_driver/releases/tag/6.1.3)
 
     - Improve README