From ce6608d35cf3ec95424d0c6dc6eff9731c958091 Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 14:57:17 +0800 Subject: [PATCH 1/7] fix errors in codeql.yml Signed-off-by: Liu, Wei Zhi --- .github/workflows/codeql.yml | 6 +++--- docker/Dockerfile | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 39adb93f..1f55fa2c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,9 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ "codeql-enable" ] pull_request: - branches: [ "master" ] + branches: [ "codeql-enable" ] schedule: - cron: '41 23 * * 3' @@ -93,7 +93,7 @@ jobs: cp ${GITHUB_WORKSPACE}/docker/Dockerfile ../workspace/ros2_openvino_toolkit_test ls ../workspace/ros2_openvino_toolkit_test/Dockerfile cd ../workspace/ros2_openvino_toolkit_test - docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic -t ros2_openvino_docker:01 . + docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg BUILD_FOLDER=. -t ros2_openvino_docker:01 . - name: Perform CodeQL Analysis diff --git a/docker/Dockerfile b/docker/Dockerfile index 5a53d585..21820605 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,11 @@ # ros2 openvino toolkit env master f1b1ca4d914186a1881b87f103be9c6e910c9d80 ARG ROS_PRE_INSTALLED_PKG -FROM osrf/ros:${ROS_PRE_INSTALLED_PKG} +ARG BUILD_FOLDER ARG VERSION +FROM osrf/ros:${ROS_PRE_INSTALLED_PKG} +VOLUME [${BUILD_FOLDER}, "/root/catkin_ws"] + # setting proxy env --option # If needed, enable the below ENV setting by correct proxies. From 95c7e294b44b501de12d71029b6c3097782c34d9 Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 15:08:02 +0800 Subject: [PATCH 2/7] bug fix. Signed-off-by: Liu, Wei Zhi --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 21820605..16504c23 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,11 +2,10 @@ ARG ROS_PRE_INSTALLED_PKG ARG BUILD_FOLDER -ARG VERSION FROM osrf/ros:${ROS_PRE_INSTALLED_PKG} VOLUME [${BUILD_FOLDER}, "/root/catkin_ws"] - +ARG VERSION # setting proxy env --option # If needed, enable the below ENV setting by correct proxies. # ENV HTTP_PROXY="your_proxy" From 78b692a0edfce064cc3382473adc39fe769969c8 Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 15:47:22 +0800 Subject: [PATCH 3/7] bug fix. Signed-off-by: Liu, Wei Zhi --- .github/workflows/codeql.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1f55fa2c..171b7143 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -94,6 +94,7 @@ jobs: ls ../workspace/ros2_openvino_toolkit_test/Dockerfile cd ../workspace/ros2_openvino_toolkit_test docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg BUILD_FOLDER=. -t ros2_openvino_docker:01 . + cp ./install ~/work/_temp/codeql_databases/cpp -rf - name: Perform CodeQL Analysis From 8611f3bcd1aec19f26a0d7c1dbadb511723bc89d Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 16:01:45 +0800 Subject: [PATCH 4/7] bug fix. Signed-off-by: Liu, Wei Zhi --- .github/workflows/codeql.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 171b7143..cebd347e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -94,7 +94,8 @@ jobs: ls ../workspace/ros2_openvino_toolkit_test/Dockerfile cd ../workspace/ros2_openvino_toolkit_test docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg BUILD_FOLDER=. -t ros2_openvino_docker:01 . - cp ./install ~/work/_temp/codeql_databases/cpp -rf + ls -l + cp ./catkin_ws/install ~/work/_temp/codeql_databases/cpp -rf - name: Perform CodeQL Analysis From a7be6faf4f85a3226a6f1a49ba589dd3616a1a00 Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 17:06:23 +0800 Subject: [PATCH 5/7] bug fix4. Signed-off-by: Liu, Wei Zhi --- .github/workflows/codeql.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cebd347e..49712860 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -93,9 +93,10 @@ jobs: cp ${GITHUB_WORKSPACE}/docker/Dockerfile ../workspace/ros2_openvino_toolkit_test ls ../workspace/ros2_openvino_toolkit_test/Dockerfile cd ../workspace/ros2_openvino_toolkit_test - docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic --build-arg BUILD_FOLDER=. -t ros2_openvino_docker:01 . + docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic -t ros2_openvino_docker:01 . + docker run --name temp_ov ros2_openvino_docker:01 + docker cp temp_ov:/root/catkin_ws/install ~/work/_temp/codeql_databases/cpp ls -l - cp ./catkin_ws/install ~/work/_temp/codeql_databases/cpp -rf - name: Perform CodeQL Analysis From c22865798e3d1ff458c1530e4baaff30ce88e873 Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 17:18:09 +0800 Subject: [PATCH 6/7] bug fix5. Signed-off-by: Liu, Wei Zhi --- .github/workflows/codeql.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 49712860..5d6d141e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -96,7 +96,8 @@ jobs: docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic -t ros2_openvino_docker:01 . docker run --name temp_ov ros2_openvino_docker:01 docker cp temp_ov:/root/catkin_ws/install ~/work/_temp/codeql_databases/cpp - ls -l + docker rm temp_ov + ls -l ~/work/_temp/codeql_databases/ - name: Perform CodeQL Analysis From afa653e9c86112166b9800b54ea99ff6f99dad7c Mon Sep 17 00:00:00 2001 From: "Liu, Wei Zhi" Date: Tue, 2 Jul 2024 17:42:19 +0800 Subject: [PATCH 7/7] bug fix6. Signed-off-by: Liu, Wei Zhi --- .github/workflows/codeql.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5d6d141e..9483a4cb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -95,9 +95,10 @@ jobs: cd ../workspace/ros2_openvino_toolkit_test docker build --build-arg ROS_PRE_INSTALLED_PKG=galactic-desktop --build-arg VERSION=galactic -t ros2_openvino_docker:01 . docker run --name temp_ov ros2_openvino_docker:01 + docker ps docker cp temp_ov:/root/catkin_ws/install ~/work/_temp/codeql_databases/cpp docker rm temp_ov - ls -l ~/work/_temp/codeql_databases/ + tree ~/work/_temp/codeql_databases/ - name: Perform CodeQL Analysis