Skip to content

Commit 2333ab2

Browse files
authored
Merge branch 'main' into issue_844
2 parents d0f0462 + 70a6a31 commit 2333ab2

File tree

162 files changed

+9877
-3431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+9877
-3431
lines changed

.github/helpers/check_urls.sh

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
IGNORE_FILES=""
6+
IGNORE_PATTERNS=""
7+
8+
while getopts ":f:d:p:" opt; do
9+
case "${opt}" in
10+
f)
11+
IGNORE_FILES="${OPTARG}";;
12+
d)
13+
IGNORE_DIRS="${OPTARG}";;
14+
p)
15+
IGNORE_PATTERNS="${OPTARG}";;
16+
\?)
17+
echo "Invalid option -$OPTARG"
18+
exit;;
19+
esac
20+
done
21+
22+
read -r -a ignore_files <<<"$IGNORE_FILES"
23+
read -r -a ignore_dirs <<<"$IGNORE_DIRS"
24+
read -r -a ignore_patterns <<<"$IGNORE_PATTERNS"
25+
26+
IGNORE_FILES_ARG=""
27+
for item in "${ignore_files[@]}"; do
28+
IGNORE_FILES_ARG="$IGNORE_FILES_ARG --exclude=$item"
29+
done
30+
IGNORE_DIRS_ARG=""
31+
for item in "${ignore_dirs[@]}"; do
32+
IGNORE_DIRS_ARG="$IGNORE_DIRS_ARG --exclude-dir=$item"
33+
done
34+
35+
#Find URLs in code:
36+
urls=$(grep -oP '(http|ftp|https):\/\/([a-zA-Z0-9_-]+(?:(?:\.[a-zA-Z0-9_-]+)+))([a-zA-Z0-9_.,@?^=%&:\/~+#-]*[a-zA-Z0-9_@?^=%&\/~+#-])?' -rI $IGNORE_FILES_ARG $IGNORE_DIRS_ARG)
37+
38+
fail_counter=0
39+
40+
FAILED_LINKS=()
41+
for item in $urls; do
42+
# echo $item
43+
skip=0
44+
for pattern in "${ignore_patterns[@]}"; do
45+
[[ "$item" =~ $pattern ]] && skip=1
46+
done
47+
48+
if [[ $skip == 1 ]]; then
49+
echo "SKIPPING $item"
50+
continue
51+
fi
52+
53+
filename=$(echo "$item" | cut -d':' -f1)
54+
url=$(echo "$item" | cut -d':' -f2-)
55+
echo -n "Checking $url from file $filename"
56+
if ! curl --head --silent --fail "$url" 2>&1 > /dev/null; then
57+
echo -e " \033[0;31mNOT FOUND\033[32m\n"
58+
FAILED_LINKS+=("$url from file $filename")
59+
((fail_counter=fail_counter+1))
60+
else
61+
printf " \033[32mok\033[0m\n"
62+
fi
63+
done
64+
65+
echo "Failed files:"
66+
printf '%s\n' "${FAILED_LINKS[@]}"
67+
exit $fail_counter

.github/workflows/check_links.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Check Links
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
9+
jobs:
10+
check_links:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- name: Check URLs
15+
run: |
16+
.github/helpers/check_urls.sh \
17+
-d ".git build CMakeModules debian" \
18+
-f "package.xml ursim_docker.rst architecture_coarse.svg" \
19+
-p "vnc\.html opensource\.org\/licenses\/BSD-3-Clause"

.github/workflows/ci-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
runs-on: ubuntu-22.04
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: actions/setup-python@v4
19+
- uses: actions/setup-python@v5
2020
with:
2121
python-version: 3.10.4
2222
- name: Install system hooks
2323
run: sudo apt-get install clang-format-14 cppcheck
24-
- uses: pre-commit/[email protected].0
24+
- uses: pre-commit/[email protected].1
2525
with:
2626
extra_args: --all-files --hook-stage manual

.github/workflows/coverage-build.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
jobs:
88
coverage:
99
name: coverage build
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
container:
12-
image: ubuntu:jammy
12+
image: ubuntu:noble
1313
strategy:
1414
fail-fast: false
1515
env:
@@ -19,33 +19,37 @@ jobs:
1919
- uses: ros-tooling/[email protected]
2020
with:
2121
required-ros-distributions: ${{ env.ROS_DISTRO }}
22+
use-ros2-testing: true
2223
- uses: actions/checkout@v4
2324
- uses: ros-tooling/[email protected]
2425
with:
2526
target-ros2-distro: ${{ env.ROS_DISTRO }}
2627
# build all packages listed in the meta package
2728
package-name:
28-
ur
29+
ur_calibration
2930
ur_controllers
30-
ur_dashboard_msgs
31-
ur_moveit_config
3231
ur_robot_driver
3332
vcs-repo-file-url: |
3433
https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/Universal_Robots_ROS2_Driver-not-released.${{ env.ROS_DISTRO }}.repos
3534
colcon-defaults: |
3635
{
3736
"build": {
38-
"mixin": ["coverage-gcc"]
37+
"mixin": ["coverage-gcc", "coverage-pytest"]
38+
},
39+
"test": {
40+
"mixin": ["coverage-pytest"]
3941
}
4042
}
4143
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
42-
skip-tests: true
43-
- uses: codecov/codecov-action@v3
44+
skip-tests: false
45+
- uses: codecov/codecov-action@v5
4446
with:
47+
fail_ci_if_error: true
4548
file: ros_ws/lcov/total_coverage.info
4649
flags: unittests
4750
name: codecov-umbrella
48-
- uses: actions/upload-artifact@v3
51+
token: ${{ secrets.CODECOV_TOKEN }}
52+
- uses: actions/upload-artifact@v4
4953
with:
5054
name: colcon-logs-${{ matrix.os }}
5155
path: ros_ws/log

.github/workflows/foxy-semi-binary-build.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/galactic-execution-test.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/galactic-semi-binary-build.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/humble-binary-main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
name: Humble Binary Build Main
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
64
schedule:
75
# Run every morning to detect flakiness and broken dependencies
86
- cron: '03 5 * * *'
97

10-
118
jobs:
12-
binary:
9+
humble_binary_main:
1310
uses: ./.github/workflows/reusable_ici.yml
1411
with:
1512
ros_distro: humble

.github/workflows/humble-binary-testing.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: Humble Binary Build Testing
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
64
schedule:
75
# Run every morning to detect flakiness and broken dependencies
86
- cron: '03 5 * * *'
97

108

119
jobs:
12-
binary:
10+
humble_binary_testing:
1311
uses: ./.github/workflows/reusable_ici.yml
1412
with:
1513
ros_distro: humble

.github/workflows/humble-semi-binary-main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: Humble Semi Binary Build Main
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
64
schedule:
75
# Run every morning to detect flakiness and broken dependencies
86
- cron: '03 5 * * *'
97

108

119
jobs:
12-
binary:
10+
humble_semi_main:
1311
uses: ./.github/workflows/reusable_ici.yml
1412
with:
1513
ros_distro: humble

0 commit comments

Comments
 (0)