Skip to content

Commit 9204a39

Browse files
authored
Merge pull request #1 from urfeex/win-build
2 parents 2dc9bb5 + c2db15d commit 9204a39

File tree

65 files changed

+2195
-2512
lines changed

Some content is hidden

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

65 files changed

+2195
-2512
lines changed

.github/actions/rosdoc_lite_action/Dockerfile

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

.github/actions/rosdoc_lite_action/action.yml

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

.github/actions/rosdoc_lite_action/entrypoint.sh

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

.github/dependabot.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Update actions in workflows weekly
2+
3+
version: 2
4+
5+
updates:
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
interval: "weekly"

.github/workflows/ci.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: Integration tests
2-
on: [push, pull_request]
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
38

49
jobs:
510
build:
@@ -30,15 +35,11 @@ jobs:
3035
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
3136

3237
steps:
33-
- uses: actions/checkout@v1
38+
- uses: actions/checkout@v4
3439
- name: start ursim
3540
run: |
3641
scripts/start_ursim.sh -m $ROBOT_MODEL -v $URSIM_VERSION -p $PROGRAM_FOLDER -d
3742
env: ${{matrix.env}}
38-
- name: install gtest
39-
run: sudo apt-get install -y libgtest-dev
40-
- name: install boost
41-
run: sudo apt-get install -y libboost-dev
4243
- name: configure
4344
run: mkdir build && cd build && cmake .. -DBUILDING_TESTS=1 -DINTEGRATION_TESTS=1 -DWITH_ASAN=ON
4445
env:
@@ -58,9 +59,10 @@ jobs:
5859
- name: gcovr
5960
run: cd build && gcovr -r ..
6061
- name: Upload coverage to Codecov
61-
uses: codecov/codecov-action@v3
62+
uses: codecov/codecov-action@v5
6263
with:
63-
gcov: true
64+
fail_ci_if_error: true
65+
token: ${{ secrets.CODECOV_TOKEN }}
6466
- name: Generate URSim log files
6567
if: always()
6668
run: |
@@ -77,15 +79,15 @@ jobs:
7779
mkdir -p ursim_logs/flightreports
7880
docker cp ursim:/ursim/flightreports/. ursim_logs/flightreports/
7981
- name: Upload logfiles
80-
uses: actions/upload-artifact@v3
82+
uses: actions/upload-artifact@v4
8183
if: always()
8284
with:
8385
name: ${{matrix.env.ROBOT_MODEL}}_${{matrix.env.URSIM_VERSION}}_URSim_Logs
8486
path: ursim_logs
8587
if-no-files-found: error
8688
retention-days: 10
8789
- name: Upload test artifacts
88-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
8991
if: always()
9092
with:
9193
name: ${{matrix.env.ROBOT_MODEL}}_${{matrix.env.URSIM_VERSION}}_test_artifacts
@@ -96,16 +98,10 @@ jobs:
9698
check_links:
9799
runs-on: ubuntu-latest
98100
steps:
99-
- uses: actions/checkout@v2
101+
- uses: actions/checkout@v4
100102
- name: Check URLs
101103
run: |
102104
.github/helpers/check_urls.sh \
103105
-d ".git build CMakeModules debian" \
104-
-f "package.xml architecture_coarse.svg dataflow.graphml start_ursim.sh" \
106+
-f "package.xml urcl_architecture.svg trajectory_interface.svg dataflow.graphml start_ursim.sh" \
105107
-p "vnc\.html opensource\.org\/licenses\/BSD-3-Clause kernel\.org\/pub\/linux\/kernel"
106-
107-
rosdoc_lite_check:
108-
runs-on: ubuntu-latest
109-
steps:
110-
- uses: actions/checkout@v1
111-
- uses: ./.github/actions/rosdoc_lite_action

.github/workflows/industrial-ci.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: ROS industrial ci
2-
on: [push, pull_request]
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
38

49
jobs:
510
industrial_ci:
@@ -11,7 +16,6 @@ jobs:
1116
ROS_DISTRO:
1217
- {NAME: noetic, DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS_Driver#master https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS_Driver/master/.noetic.rosinstall"}
1318
- {NAME: humble, DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#humble"}
14-
- {NAME: iron, DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#iron"}
1519
- {NAME: jazzy, DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main"}
1620
- {NAME: rolling, DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main"}
1721
ROS_REPO:
@@ -22,6 +26,7 @@ jobs:
2226
steps:
2327
- uses: actions/checkout@v4
2428
- run: docker network create --subnet=192.168.56.0/24 ursim_net
29+
if: ${{ !env.ACT }}
2530
- uses: 'ros-industrial/industrial_ci@master'
2631
env:
2732
IMMEDIATE_TEST_OUTPUT: true
@@ -30,3 +35,5 @@ jobs:
3035
DOWNSTREAM_WORKSPACE: ${{matrix.ROS_DISTRO.DOWNSTREAM_WORKSPACE}}
3136
ROS_DISTRO: ${{matrix.ROS_DISTRO.NAME}}
3237
ROS_REPO: ${{matrix.ROS_REPO}}
38+
CLANG_TIDY: true
39+
CLANG_TIDY_ARGS: '--extra-arg=-std=c++17' # needed for Humble

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@ on:
88
pull_request:
99
push:
1010
branches:
11-
- main
11+
- master
1212

1313
jobs:
1414
pre-commit:
1515
name: pre-commit
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: actions/setup-python@v4
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-python@v5
2020
with:
2121
python-version: 3.10.4
22-
- name: Install system hooks
23-
run: sudo apt-get install clang-format-14 cppcheck
24-
- uses: pre-commit/[email protected]
22+
- uses: pre-commit/[email protected]
2523
with:
2624
extra_args: --all-files --hook-stage manual
2725

.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
OS_VERSION: noble
2727

2828
steps:
29-
- uses: actions/checkout@v1
29+
- uses: actions/checkout@v4
3030
- run: sudo apt-get install -y python3-pip
3131
- run: sudo pip3 install empy==3.3.4 # Added as bloom not yet support empy v4
3232
- run: sudo pip3 install bloom rosdep

.github/workflows/sphinx_build.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: "Build documentation"
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
push:
7+
branches:
8+
- main
9+
schedule:
10+
- cron: '38 2 * * *'
11+
12+
jobs:
13+
docs:
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
steps:
20+
- uses: actions/checkout@v4
21+
- uses: actions/setup-python@v5
22+
with:
23+
cache: 'pip'
24+
- name: Install dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install -r doc_requirements.txt
28+
- name: Build documentation
29+
run: |
30+
sphinx-build -W -b html doc _doc_build

.github/workflows/win-build.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Windows build and tests
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
win-build:
11+
timeout-minutes: 30
12+
runs-on: windows-2022
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: configure
17+
run: mkdir build && cd build && cmake .. -DBUILDING_TESTS=1
18+
#run: mkdir build && cd build && cmake .. -DBUILDING_TESTS=1 -DINTEGRATION_TESTS=1
19+
- name: build
20+
run: cmake --build build --config Debug
21+
- name: test
22+
run: cd build && ctest --output-on-failure -C Debug

0 commit comments

Comments
 (0)