From da03057a13f1f8632c5fb13a70ef35e75a6ff6b8 Mon Sep 17 00:00:00 2001
From: 4c3y <69460051+4c3y@users.noreply.github.com>
Date: Tue, 2 May 2023 11:09:19 +0200
Subject: [PATCH 1/5] Removed ubuntu 18.04 workflow and added ubuntu 22.04

---
 ...run_build_ubuntu18_04.sh => run_build_ubuntu22_04.sh} | 9 ++++-----
 .../{cpp_ubuntu18_04.yml => cpp_ubuntu22_04.yml}         | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename .github/scripts/{run_build_ubuntu18_04.sh => run_build_ubuntu22_04.sh} (77%)
 mode change 100755 => 100644
 rename .github/workflows/{cpp_ubuntu18_04.yml => cpp_ubuntu22_04.yml} (53%)

diff --git a/.github/scripts/run_build_ubuntu18_04.sh b/.github/scripts/run_build_ubuntu22_04.sh
old mode 100755
new mode 100644
similarity index 77%
rename from .github/scripts/run_build_ubuntu18_04.sh
rename to .github/scripts/run_build_ubuntu22_04.sh
index b73d39f..a23f9b6
--- a/.github/scripts/run_build_ubuntu18_04.sh
+++ b/.github/scripts/run_build_ubuntu22_04.sh
@@ -1,17 +1,17 @@
 CATKIN_PATH="$(which catkin)"
 
 if [ "$CATKIN_PATH" = "" ]; then
-    echo "Installing ros melodic"
+    echo "Installing ros noetic"
 
     sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
     sudo apt install curl
     curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
     sudo apt update
-    sudo apt install ros-melodic-ros-base
+    sudo apt install ros-noetic-ros-base
 
-    source /opt/ros/melodic/setup.bash
+    source /opt/ros/noetic/setup.bash
 
-    sudo apt install python-rosdep python-rosinstall python-rosinstall-generator python-wstool build-essential python-catkin-tools libgoogle-glog-dev
+    sudo apt install python3-rosdep python3-rosinstall python3-rosinstall-generator python3-wstool build-essential python3-catkin-tools libgoogle-glog-dev
 
     sudo rosdep init
     rosdep update
@@ -31,7 +31,6 @@ else
 fi
 
 
-mkdir $BUILD_DIR
 cmake CMakeLists.txt -B $BUILD_DIR/
 cd $BUILD_DIR || exit
 cmake --build . --target test_default -- -j 6
diff --git a/.github/workflows/cpp_ubuntu18_04.yml b/.github/workflows/cpp_ubuntu22_04.yml
similarity index 53%
rename from .github/workflows/cpp_ubuntu18_04.yml
rename to .github/workflows/cpp_ubuntu22_04.yml
index 3334923..9ee6552 100644
--- a/.github/workflows/cpp_ubuntu18_04.yml
+++ b/.github/workflows/cpp_ubuntu22_04.yml
@@ -1,17 +1,17 @@
-name: C++ Ubuntu 18.04
+name: C++ Ubuntu 22.04
 
 on:
   push:
-    branches: 
+    branches:
     - "master"
   pull_request:
 
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
-      run: ./.github/scripts/run_build_ubuntu18_04.sh
+      run: ./.github/scripts/run_build_ubuntu22_04.sh

From 31ba31f398ad275f06d072f6ba847f3bd919e42b Mon Sep 17 00:00:00 2001
From: 4c3y <69460051+4c3y@users.noreply.github.com>
Date: Tue, 2 May 2023 11:11:43 +0200
Subject: [PATCH 2/5] Added execute flag tu run_build_ubuntu22_04.sh

---
 .github/scripts/run_build_ubuntu22_04.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 .github/scripts/run_build_ubuntu22_04.sh

diff --git a/.github/scripts/run_build_ubuntu22_04.sh b/.github/scripts/run_build_ubuntu22_04.sh
old mode 100644
new mode 100755

From 8db36f471487d0309657712d06fe1706ab004dc0 Mon Sep 17 00:00:00 2001
From: 4c3y <69460051+4c3y@users.noreply.github.com>
Date: Tue, 2 May 2023 11:22:14 +0200
Subject: [PATCH 3/5] Build ros from source in ubuntu 22.04 workflow

---
 .github/scripts/run_build_ubuntu22_04.sh | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/run_build_ubuntu22_04.sh b/.github/scripts/run_build_ubuntu22_04.sh
index a23f9b6..0b12824 100755
--- a/.github/scripts/run_build_ubuntu22_04.sh
+++ b/.github/scripts/run_build_ubuntu22_04.sh
@@ -3,18 +3,12 @@ CATKIN_PATH="$(which catkin)"
 if [ "$CATKIN_PATH" = "" ]; then
     echo "Installing ros noetic"
 
-    sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
-    sudo apt install curl
-    curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
-    sudo apt update
-    sudo apt install ros-noetic-ros-base
-
-    source /opt/ros/noetic/setup.bash
-
-    sudo apt install python3-rosdep python3-rosinstall python3-rosinstall-generator python3-wstool build-essential python3-catkin-tools libgoogle-glog-dev
-
-    sudo rosdep init
-    rosdep update
+    git clone git@github.com:lucasw/ros_from_src.git
+    mkdir build
+    cd build
+    ROSCONSOLE=https://github.com/ros/rosconsole ../ros_from_src/git_clone.sh
+    sudo ../ros_from_src/dependencies.sh
+    ../ros_from_src/build.sh
 
 else
   sudo apt install -y libgoogle-glog-dev

From 30d6b03f93835fa0b475d56a26fbc6f08e99142c Mon Sep 17 00:00:00 2001
From: 4c3y <69460051+4c3y@users.noreply.github.com>
Date: Tue, 2 May 2023 11:23:53 +0200
Subject: [PATCH 4/5] Clone over https

---
 .github/scripts/run_build_ubuntu22_04.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/run_build_ubuntu22_04.sh b/.github/scripts/run_build_ubuntu22_04.sh
index 0b12824..381cabe 100755
--- a/.github/scripts/run_build_ubuntu22_04.sh
+++ b/.github/scripts/run_build_ubuntu22_04.sh
@@ -3,7 +3,7 @@ CATKIN_PATH="$(which catkin)"
 if [ "$CATKIN_PATH" = "" ]; then
     echo "Installing ros noetic"
 
-    git clone git@github.com:lucasw/ros_from_src.git
+    git clone https://github.com/lucasw/ros_from_src.git
     mkdir build
     cd build
     ROSCONSOLE=https://github.com/ros/rosconsole ../ros_from_src/git_clone.sh

From 23ce8abb480b17c71df858511e375bc1ad298b94 Mon Sep 17 00:00:00 2001
From: 4c3y <69460051+4c3y@users.noreply.github.com>
Date: Tue, 2 May 2023 11:48:30 +0200
Subject: [PATCH 5/5] Removed ubuntu 22.04 CI

---
 .github/scripts/run_build_ubuntu22_04.sh | 40 ------------------------
 .github/workflows/cpp_ubuntu22_04.yml    | 17 ----------
 2 files changed, 57 deletions(-)
 delete mode 100755 .github/scripts/run_build_ubuntu22_04.sh
 delete mode 100644 .github/workflows/cpp_ubuntu22_04.yml

diff --git a/.github/scripts/run_build_ubuntu22_04.sh b/.github/scripts/run_build_ubuntu22_04.sh
deleted file mode 100755
index 381cabe..0000000
--- a/.github/scripts/run_build_ubuntu22_04.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-CATKIN_PATH="$(which catkin)"
-
-if [ "$CATKIN_PATH" = "" ]; then
-    echo "Installing ros noetic"
-
-    git clone https://github.com/lucasw/ros_from_src.git
-    mkdir build
-    cd build
-    ROSCONSOLE=https://github.com/ros/rosconsole ../ros_from_src/git_clone.sh
-    sudo ../ros_from_src/dependencies.sh
-    ../ros_from_src/build.sh
-
-else
-  sudo apt install -y libgoogle-glog-dev
-  echo "catkin found"
-fi
-
-export DEBIAN_FRONTEND=noninteractive
-BUILD_DIR=cmake-build
-
-if test -d "$BUILD_DIR"; then
-  rm -r $BUILD_DIR
-else
-  mkdir $BUILD_DIR
-fi
-
-
-cmake CMakeLists.txt -B $BUILD_DIR/
-cd $BUILD_DIR || exit
-cmake --build . --target test_default -- -j 6
-cmake --build . --target test_glog -- -j 6
-cmake --build . --target test_lpp -- -j 6
-cmake --build . --target test_lpp_custom -- -j 6
-cmake --build . --target test_roslog -- -j 6
-cd devel/lib/lpp
-./test_default
-./test_roslog
-./test_lpp
-./test_lpp_custom
-./test_roslog
\ No newline at end of file
diff --git a/.github/workflows/cpp_ubuntu22_04.yml b/.github/workflows/cpp_ubuntu22_04.yml
deleted file mode 100644
index 9ee6552..0000000
--- a/.github/workflows/cpp_ubuntu22_04.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: C++ Ubuntu 22.04
-
-on:
-  push:
-    branches:
-    - "master"
-  pull_request:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-22.04
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Run build script
-      run: ./.github/scripts/run_build_ubuntu22_04.sh