Skip to content

Commit 83fa37d

Browse files
authored
Merge branch 'master' into fix/rtde-reconnect-thread-blocking-destructor
2 parents 9025946 + 0b3d1e3 commit 83fa37d

47 files changed

Lines changed: 923 additions & 189 deletions

Some content is hidden

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

.github/workflows/alpine-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: install dependencies
1919
run: apk add --no-cache build-base cmake linux-headers git
20-
- uses: actions/checkout@v6
20+
- uses: actions/checkout@v7
2121
- name: configure
2222
run: mkdir build && cd build && cmake .. -DBUILDING_TESTS=1 -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
2323
- name: build

.github/workflows/check_links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check_links:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v6
13+
- uses: actions/checkout@v7
1414
- name: Restore lychee cache
1515
id: restore-cache
1616
uses: actions/cache/restore@v5

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: ubuntu_build
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v6
16+
- uses: actions/checkout@v7
1717
- name: Install build-tools
1818
run: sudo apt-get update && sudo apt-get install -y build-essential cmake python3-pandas python3-lxml
1919
- name: configure
@@ -73,9 +73,12 @@ jobs:
7373
- ROBOT_MODEL: 'ur5e'
7474
URSIM_VERSION: '10.12.0'
7575
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
76+
- ROBOT_MODEL: 'ur7e'
77+
URSIM_VERSION: '10.13.0'
78+
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
7679

7780
steps:
78-
- uses: actions/checkout@v6
81+
- uses: actions/checkout@v7
7982
- name: start ursim
8083
run: |
8184
scripts/start_ursim.sh -m $ROBOT_MODEL -v $URSIM_VERSION -p $PROGRAM_FOLDER -d -f DISABLED
@@ -260,7 +263,7 @@ jobs:
260263
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
261264

262265
steps:
263-
- uses: actions/checkout@v6
266+
- uses: actions/checkout@v7
264267
- name: start ursim
265268
run: |
266269
scripts/start_ursim.sh -m $ROBOT_MODEL -v $URSIM_VERSION -p $PROGRAM_FOLDER -d -f DISABLED
@@ -298,7 +301,7 @@ jobs:
298301
test_start_ursim:
299302
runs-on: ubuntu-latest
300303
steps:
301-
- uses: actions/checkout@v6
304+
- uses: actions/checkout@v7
302305
- uses: ruby/setup-ruby@v1
303306
with:
304307
ruby-version: '3.3' # Not needed with a .ruby-version, .tool-versions or mise.toml

.github/workflows/industrial-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
env:
3535
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
3636
steps:
37-
- uses: actions/checkout@v6
37+
- uses: actions/checkout@v7
3838
- run: docker network create --subnet=192.168.56.0/24 ursim_net
3939
if: ${{ !env.ACT }}
4040
- uses: 'ros-industrial/industrial_ci@master'

.github/workflows/mac-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
arch: x86_64
2424

2525
steps:
26-
- uses: actions/checkout@v6
26+
- uses: actions/checkout@v7
2727
- name: configure
2828
run: >
2929
mkdir build && cd build &&

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: pre-commit
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v6
18+
- uses: actions/checkout@v7
1919
- uses: actions/setup-python@v6
2020
with:
2121
python-version: 3.10.4

.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
OS_VERSION: resolute
2626

2727
steps:
28-
- uses: actions/checkout@v6
28+
- uses: actions/checkout@v7
2929
- run: sudo apt-get install -y python3-pip
3030
- run: sudo pip3 install empy==3.3.4 # Added as bloom not yet support empy v4
3131
- run: sudo pip3 install bloom rosdep

.github/workflows/rhel_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- NAME: rolling
2323

2424
steps:
25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v7
2626
with:
2727
path: ${{ env.path }}
2828
- name: Build workspace

.github/workflows/sphinx_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
concurrency:
1818
group: ${{ github.workflow }}-${{ github.ref }}
1919
steps:
20-
- uses: actions/checkout@v6
20+
- uses: actions/checkout@v7
2121
- uses: actions/setup-python@v6
2222
with:
2323
cache: 'pip'

.github/workflows/test_python_scripts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
test_python_scripts:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v6
14+
- uses: actions/checkout@v7
1515
- uses: actions/setup-python@v6
1616
with:
1717
python-version: "3.12"

0 commit comments

Comments
 (0)