Skip to content

Commit 3810098

Browse files
committed
Merge remote-tracking branch 'origin/develop' into release/2.6.0
2 parents f530216 + dc5f8b9 commit 3810098

Some content is hidden

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

59 files changed

+346
-288
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ inputs:
66
description: Space-separated build target names
77
default: all
88
subtract_threads:
9-
description: An option for the action get_number_of_threads. See get_number_of_threads
9+
description: An option for the action get-threads-number.
1010
required: true
1111
default: "0"
1212

1313
runs:
1414
using: composite
1515
steps:
1616
- name: Get number of threads
17-
uses: ./.github/actions/get_number_of_threads
17+
uses: ./.github/actions/get-threads-number
1818
id: number_of_threads
1919
with:
2020
subtract_threads: ${{ inputs.subtract_threads }}

.github/actions/build_docker_image/action.yml renamed to .github/actions/build-docker-image/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ runs:
3434
steps:
3535
- name: Login to DockerHub
3636
if: ${{ inputs.push_image == 'true' && inputs.dockerhub_repo != '' }}
37-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
37+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
3838
with:
3939
username: ${{ env.DOCKERHUB_USER }}
4040
password: ${{ env.DOCKERHUB_PW }}
4141

4242
- name: Login to GitHub Container Registry
4343
if: ${{ inputs.push_image == 'true' }}
44-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
44+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
4545
with:
4646
registry: ghcr.io
4747
username: ${{ github.repository_owner }}
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
steps:
2828
- name: Find common commit
2929
id: git_common_ancestor
30-
uses: ./.github/actions/git_common_ancestor
30+
uses: ./.github/actions/git-common-ancestor
3131

3232
- name: Restore ccache cache
3333
uses: actions/cache/restore@v4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
steps:
2929
- name: Find common commit
3030
id: git_common_ancestor
31-
uses: ./.github/actions/git_common_ancestor
31+
uses: ./.github/actions/git-common-ancestor
3232

3333
- name: Save ccache cache
3434
if: ${{ inputs.ccache_cache_hit != 'true' || inputs.ccache_cache_miss_rate == '100.0' }}

.github/dependabot.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ updates:
1414
target-branch: develop
1515

1616
- package-ecosystem: github-actions
17-
directory: .github/actions/build_clio/
17+
directory: .github/actions/build-clio/
1818
schedule:
1919
interval: weekly
2020
day: monday
@@ -27,7 +27,7 @@ updates:
2727
target-branch: develop
2828

2929
- package-ecosystem: github-actions
30-
directory: .github/actions/build_docker_image/
30+
directory: .github/actions/build-docker-image/
3131
schedule:
3232
interval: weekly
3333
day: monday
@@ -53,7 +53,7 @@ updates:
5353
target-branch: develop
5454

5555
- package-ecosystem: github-actions
56-
directory: .github/actions/code_coverage/
56+
directory: .github/actions/code-coverage/
5757
schedule:
5858
interval: weekly
5959
day: monday
@@ -79,7 +79,7 @@ updates:
7979
target-branch: develop
8080

8181
- package-ecosystem: github-actions
82-
directory: .github/actions/create_issue/
82+
directory: .github/actions/create-issue/
8383
schedule:
8484
interval: weekly
8585
day: monday
@@ -92,7 +92,7 @@ updates:
9292
target-branch: develop
9393

9494
- package-ecosystem: github-actions
95-
directory: .github/actions/get_number_of_threads/
95+
directory: .github/actions/get-threads-number/
9696
schedule:
9797
interval: weekly
9898
day: monday
@@ -105,7 +105,7 @@ updates:
105105
target-branch: develop
106106

107107
- package-ecosystem: github-actions
108-
directory: .github/actions/git_common_ancestor/
108+
directory: .github/actions/git-common-ancestor/
109109
schedule:
110110
interval: weekly
111111
day: monday
@@ -118,7 +118,7 @@ updates:
118118
target-branch: develop
119119

120120
- package-ecosystem: github-actions
121-
directory: .github/actions/restore_cache/
121+
directory: .github/actions/restore-cache/
122122
schedule:
123123
interval: weekly
124124
day: monday
@@ -131,7 +131,7 @@ updates:
131131
target-branch: develop
132132

133133
- package-ecosystem: github-actions
134-
directory: .github/actions/save_cache/
134+
directory: .github/actions/save-cache/
135135
schedule:
136136
interval: weekly
137137
day: monday

.github/scripts/conan/generate_matrix.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import json
44

55
LINUX_OS = ["heavy", "heavy-arm64"]
6-
LINUX_CONTAINERS = ['{ "image": "ghcr.io/xrplf/clio-ci:384e79cd32f5f6c0ab9be3a1122ead41c5a7e67d" }']
6+
LINUX_CONTAINERS = [
7+
'{ "image": "ghcr.io/xrplf/clio-ci:213752862ca95ecadeb59a6176c3db91a7864b3e" }'
8+
]
79
LINUX_COMPILERS = ["gcc", "clang"]
810

911
MACOS_OS = ["macos15"]

0 commit comments

Comments
 (0)