Skip to content

Commit 07eab69

Browse files
authored
Merge branch 'humble' into mergify/bp/humble/pr-926
2 parents ae6a589 + 50c9d4f commit 07eab69

22 files changed

Lines changed: 44 additions & 44 deletions

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: docker/setup-buildx-action@v3
2323

2424
- name: Checkout repository
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626

2727
- name: Log in to the Container registry
2828
uses: docker/login-action@v3
@@ -62,7 +62,7 @@ jobs:
6262
uses: docker/setup-buildx-action@v3
6363

6464
- name: Checkout repository
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666

6767
- name: Log in to the Container registry
6868
uses: docker/login-action@v3

.github/workflows/humble-abi-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ on:
1515
- 'ros2_control-not-released.humble.repos'
1616

1717
concurrency:
18-
# cancel previous runs of the same workflow, except for pushes on humble branch
18+
# cancel previous runs of the same workflow, except for pushes on given branches
1919
group: ${{ github.workflow }}-${{ github.ref }}
20-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
20+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2121

2222
jobs:
2323
abi_check:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ on:
3333
- cron: '03 1 * * MON-FRI'
3434

3535
concurrency:
36-
# cancel previous runs of the same workflow, except for pushes on humble branch
36+
# cancel previous runs of the same workflow, except for pushes on given branches
3737
group: ${{ github.workflow }}-${{ github.ref }}
38-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
38+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
3939

4040
jobs:
4141
binary:

.github/workflows/humble-coverage-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ on:
2929
- 'codecov.yml'
3030

3131
concurrency:
32-
# cancel previous runs of the same workflow, except for pushes on humble branch
32+
# cancel previous runs of the same workflow, except for pushes on given branches
3333
group: ${{ github.workflow }}-${{ github.ref }}
34-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
34+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
3535

3636
jobs:
3737
coverage_humble:

.github/workflows/humble-debian-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ on:
1818
- cron: '03 1 * * MON-FRI'
1919

2020
concurrency:
21-
# cancel previous runs of the same workflow, except for pushes on humble branch
21+
# cancel previous runs of the same workflow, except for pushes on given branches
2222
group: ${{ github.workflow }}-${{ github.ref }}
23-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
23+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2424

2525
jobs:
2626
debian_semi_binary_build:

.github/workflows/humble-rhel-binary-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ on:
1818
- cron: '03 1 * * MON-FRI'
1919

2020
concurrency:
21-
# cancel previous runs of the same workflow, except for pushes on humble branch
21+
# cancel previous runs of the same workflow, except for pushes on given branches
2222
group: ${{ github.workflow }}-${{ github.ref }}
23-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
23+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2424

2525
jobs:
2626
rhel_semi_binary_build:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ on:
3333
- cron: '03 1 * * MON-FRI'
3434

3535
concurrency:
36-
# cancel previous runs of the same workflow, except for pushes on humble branch
36+
# cancel previous runs of the same workflow, except for pushes on given branches
3737
group: ${{ github.workflow }}-${{ github.ref }}
38-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
38+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
3939

4040
jobs:
4141
semi-binary:

.github/workflows/jazzy-abi-compatibility.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ on:
1515
- 'ros2_control-not-released.jazzy.repos'
1616

1717
concurrency:
18-
# cancel previous runs of the same workflow, except for pushes on jazzy branch
18+
# cancel previous runs of the same workflow, except for pushes on given branches
1919
group: ${{ github.workflow }}-${{ github.ref }}
20-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
20+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2121

2222
jobs:
2323
abi_check:

.github/workflows/jazzy-binary-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ on:
3333
- cron: '03 1 * * MON-FRI'
3434

3535
concurrency:
36-
# cancel previous runs of the same workflow, except for pushes on jazzy branch
36+
# cancel previous runs of the same workflow, except for pushes on given branches
3737
group: ${{ github.workflow }}-${{ github.ref }}
38-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
38+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
3939

4040
jobs:
4141
binary:

.github/workflows/jazzy-debian-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ on:
1818
- cron: '03 1 * * MON-FRI'
1919

2020
concurrency:
21-
# cancel previous runs of the same workflow, except for pushes on jazzy branch
21+
# cancel previous runs of the same workflow, except for pushes on given branches
2222
group: ${{ github.workflow }}-${{ github.ref }}
23-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
23+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2424

2525
jobs:
2626
debian_semi_binary_build:

0 commit comments

Comments
 (0)