Skip to content

Commit 4cb82e4

Browse files
PastaPastaPastaPastaPastaPasta
committed
Merge branch 'develop' of https://github.com/dashpay/dash into develop
2 parents beec55a + ac94680 commit 4cb82e4

23 files changed

Lines changed: 866 additions & 156 deletions

‎.github/workflows/build-container.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
digest: ${{ steps.build.outputs.digest }}
3939
steps:
4040
- name: Checkout code
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
4242
with:
4343
ref: ${{ github.event.pull_request.head.sha }}
4444

@@ -51,18 +51,18 @@ jobs:
5151
echo "repo=${REPO_NAME}" >> "$GITHUB_OUTPUT"
5252
5353
- name: Set up Docker Buildx
54-
uses: docker/setup-buildx-action@v3
54+
uses: docker/setup-buildx-action@v4
5555

5656
- name: Login to GitHub Container Registry
57-
uses: docker/login-action@v3
57+
uses: docker/login-action@v4
5858
with:
5959
registry: ghcr.io
6060
username: ${{ github.actor }}
6161
password: ${{ secrets.GITHUB_TOKEN }}
6262

6363
- name: Build and push Docker image
6464
id: build
65-
uses: docker/build-push-action@v6
65+
uses: docker/build-push-action@v7
6666
with:
6767
context: ${{ inputs.context }}
6868
file: ${{ inputs.file }}
@@ -82,7 +82,7 @@ jobs:
8282
digest: ${{ steps.build.outputs.digest }}
8383
steps:
8484
- name: Checkout code
85-
uses: actions/checkout@v4
85+
uses: actions/checkout@v6
8686
with:
8787
ref: ${{ github.event.pull_request.head.sha }}
8888

@@ -95,18 +95,18 @@ jobs:
9595
echo "repo=${REPO_NAME}" >> "$GITHUB_OUTPUT"
9696
9797
- name: Set up Docker Buildx
98-
uses: docker/setup-buildx-action@v3
98+
uses: docker/setup-buildx-action@v4
9999

100100
- name: Login to GitHub Container Registry
101-
uses: docker/login-action@v3
101+
uses: docker/login-action@v4
102102
with:
103103
registry: ghcr.io
104104
username: ${{ github.actor }}
105105
password: ${{ secrets.GITHUB_TOKEN }}
106106

107107
- name: Build and push Docker image
108108
id: build
109-
uses: docker/build-push-action@v6
109+
uses: docker/build-push-action@v7
110110
with:
111111
context: ${{ inputs.context }}
112112
file: ${{ inputs.file }}
@@ -125,15 +125,15 @@ jobs:
125125
needs: [build-amd64, build-arm64]
126126
steps:
127127
- name: Checkout code
128-
uses: actions/checkout@v4
128+
uses: actions/checkout@v6
129129
with:
130130
ref: ${{ github.event.pull_request.head.sha }}
131131

132132
- name: Set up Docker Buildx
133-
uses: docker/setup-buildx-action@v3
133+
uses: docker/setup-buildx-action@v4
134134

135135
- name: Login to GitHub Container Registry
136-
uses: docker/login-action@v3
136+
uses: docker/login-action@v4
137137
with:
138138
registry: ghcr.io
139139
username: ${{ github.actor }}

‎.github/workflows/build-depends.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
dep-opts: ${{ steps.setup.outputs.DEP_OPTS }}
3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141
with:
4242
ref: ${{ github.event.pull_request.head.sha }}
4343
sparse-checkout: |
@@ -69,15 +69,15 @@ jobs:
6969

7070
- name: Check for cached depends
7171
id: cache-check
72-
uses: actions/cache@v4
72+
uses: actions/cache@v5
7373
with:
7474
path: depends/built/${{ steps.setup.outputs.HOST }}
7575
key: ${{ steps.setup.outputs.cache-key }}
7676
lookup-only: true
7777

7878
- name: Cache SDKs
7979
id: cache-sdk-check
80-
uses: actions/cache@v4
80+
uses: actions/cache@v5
8181
if: inputs.build-target == 'mac'
8282
with:
8383
path: depends/SDKs
@@ -98,19 +98,19 @@ jobs:
9898
options: --user root
9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v6
102102
with:
103103
ref: ${{ github.event.pull_request.head.sha }}
104104

105105
- name: Restore depends sources
106-
uses: actions/cache/restore@v4
106+
uses: actions/cache/restore@v5
107107
with:
108108
path: depends/sources
109109
key: depends-sources-${{ hashFiles('depends/packages/*') }}
110110
restore-keys: depends-sources-
111111

112112
- name: Restore SDKs cache
113-
uses: actions/cache/restore@v4
113+
uses: actions/cache/restore@v5
114114
if: inputs.build-target == 'mac'
115115
with:
116116
path: depends/SDKs
@@ -119,7 +119,7 @@ jobs:
119119
fail-on-cache-miss: true
120120

121121
- name: Restore cached depends
122-
uses: actions/cache/restore@v4
122+
uses: actions/cache/restore@v5
123123
with:
124124
path: depends/built/${{ needs.check-cache.outputs.host }}
125125
key: ${{ needs.check-cache.outputs.cache-key }}
@@ -132,7 +132,7 @@ jobs:
132132
env ${{ needs.check-cache.outputs.dep-opts }} make -j$(nproc) -C depends
133133
134134
- name: Save depends cache
135-
uses: actions/cache/save@v4
135+
uses: actions/cache/save@v5
136136
with:
137137
path: depends/built/${{ needs.check-cache.outputs.host }}
138138
key: ${{ needs.check-cache.outputs.cache-key }}

‎.github/workflows/build-src.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
options: --user root
4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
ref: ${{ github.event.pull_request.head.sha }}
5050
fetch-depth: 50
@@ -61,7 +61,7 @@ jobs:
6161
shell: bash
6262

6363
- name: Restore SDKs cache
64-
uses: actions/cache/restore@v4
64+
uses: actions/cache/restore@v5
6565
if: inputs.build-target == 'mac'
6666
with:
6767
path: |
@@ -70,7 +70,7 @@ jobs:
7070
fail-on-cache-miss: true
7171

7272
- name: Restore depends cache
73-
uses: actions/cache/restore@v4
73+
uses: actions/cache/restore@v5
7474
with:
7575
path: depends/built/${{ inputs.depends-host }}
7676
key: ${{ inputs.depends-key }}
@@ -84,7 +84,7 @@ jobs:
8484
shell: bash
8585

8686
- name: Restore ccache cache
87-
uses: actions/cache/restore@v4
87+
uses: actions/cache/restore@v5
8888
with:
8989
path: |
9090
/cache/ccache
@@ -111,15 +111,15 @@ jobs:
111111
if: |
112112
github.event_name == 'push' &&
113113
github.ref_name == github.event.repository.default_branch
114-
uses: actions/cache/save@v4
114+
uses: actions/cache/save@v5
115115
with:
116116
path: |
117117
/cache/ccache
118118
key: ccache-${{ hashFiles('contrib/containers/ci/ci.Dockerfile', 'depends/packages/*') }}-${{ inputs.build-target }}-${{ github.sha }}
119119

120120
- name: Restore ctcache cache
121121
if: inputs.build-target == 'linux64_multiprocess'
122-
uses: actions/cache/restore@v4
122+
uses: actions/cache/restore@v5
123123
with:
124124
path: |
125125
/cache/ctcache
@@ -141,7 +141,7 @@ jobs:
141141
inputs.build-target == 'linux64_multiprocess' &&
142142
github.event_name == 'push' &&
143143
github.ref_name == github.event.repository.default_branch
144-
uses: actions/cache/save@v4
144+
uses: actions/cache/save@v5
145145
with:
146146
path: |
147147
/cache/ctcache
@@ -165,7 +165,7 @@ jobs:
165165
echo "key=${BUNDLE_KEY}" >> "${GITHUB_OUTPUT}"
166166
167167
- name: Upload artifacts
168-
uses: actions/upload-artifact@v4
168+
uses: actions/upload-artifact@v6
169169
with:
170170
name: ${{ steps.bundle.outputs.key }}
171171
path: |

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Checkout code
4747
if: ${{ steps.skip-check.outputs.skip == 'false' }}
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949

5050
- name: Select runners
5151
id: select-runner

‎.github/workflows/cache-depends-sources.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
runs-on: ${{ inputs.runs-on || 'ubuntu-24.04-arm' }}
2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
with:
2525
ref: ${{ github.event.pull_request.head.sha }}
2626

2727
- name: Check for cached sources
2828
id: cache-check
29-
uses: actions/cache@v4
29+
uses: actions/cache@v5
3030
with:
3131
path: depends/sources
3232
key: depends-sources-${{ hashFiles('depends/packages/*') }}

‎.github/workflows/clang-diff-format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v6
1313
- name: Fetch git
1414
run: git fetch --no-tags -fu origin develop:develop
1515
- name: Run Clang-Format-Diff.py

‎.github/workflows/guix-build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
repo-name: ${{ steps.prepare.outputs.repo-name }}
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929
with:
3030
ref: ${{ github.event.pull_request.head.sha }}
3131
path: dash
3232
fetch-depth: 0
3333

3434
- name: Set up Docker Buildx
35-
uses: docker/setup-buildx-action@v3
35+
uses: docker/setup-buildx-action@v4
3636

3737
- name: Commit variables
3838
id: prepare
@@ -46,14 +46,14 @@ jobs:
4646
echo "repo-name=${REPO_NAME}" >> $GITHUB_OUTPUT
4747
4848
- name: Login to GitHub Container Registry
49-
uses: docker/login-action@v3
49+
uses: docker/login-action@v4
5050
with:
5151
registry: ghcr.io
5252
username: ${{ github.actor }}
5353
password: ${{ secrets.GITHUB_TOKEN }}
5454

5555
- name: Build Docker image
56-
uses: docker/build-push-action@v6
56+
uses: docker/build-push-action@v7
5757
with:
5858
context: ${{ github.workspace }}/dash
5959
build-args: |
@@ -84,14 +84,14 @@ jobs:
8484
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
8585
8686
- name: Checkout
87-
uses: actions/checkout@v4
87+
uses: actions/checkout@v6
8888
with:
8989
ref: ${{ github.event.pull_request.head.sha }}
9090
path: dash
9191
fetch-depth: 0
9292

9393
- name: Cache depends sources
94-
uses: actions/cache@v4
94+
uses: actions/cache@v5
9595
with:
9696
path: dash/depends/sources
9797
key: depends-sources-${{ hashFiles('dash/depends/packages/*') }}
@@ -100,7 +100,7 @@ jobs:
100100
101101
- name: Cache Guix and depends
102102
id: guix-cache-restore
103-
uses: actions/cache@v3
103+
uses: actions/cache@v5
104104
with:
105105
path: |
106106
${{ github.workspace }}/.cache
@@ -140,13 +140,13 @@ jobs:
140140
HOSTS=${{ matrix.build_target }} ./dash/contrib/containers/guix/scripts/guix-check ${{ github.workspace }}/dash
141141
142142
- name: Upload build artifacts
143-
uses: actions/upload-artifact@v4
143+
uses: actions/upload-artifact@v6
144144
with:
145145
name: guix-artifacts-${{ matrix.build_target }}
146146
path: |
147147
${{ github.workspace }}/dash/guix-build*/output/${{ matrix.build_target }}/
148148
149149
- name: Attest build provenance
150-
uses: actions/attest-build-provenance@v1
150+
uses: actions/attest@v4
151151
with:
152152
subject-path: ${{ github.workspace }}/dash/guix-build*/output/${{ matrix.build_target }}/*

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
options: --user root
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525
with:
2626
ref: ${{ github.event.pull_request.head.sha }}
2727
fetch-depth: 50

‎.github/workflows/merge-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0
2020

@@ -49,7 +49,7 @@ jobs:
4949
needs rebase
5050
5151
- name: comment
52-
uses: mshick/add-pr-comment@v2
52+
uses: mshick/add-pr-comment@v3
5353
if: failure()
5454
with:
5555
message: |

‎.github/workflows/predict-conflicts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
ghToken: "${{ secrets.GITHUB_TOKEN }}"
3030
- name: Checkout
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
3232
- name: validate potential conflicts
3333
id: validate_conflicts
3434
run: pip3 install hjson && .github/workflows/handle_potential_conflicts.py "$conflicts"

0 commit comments

Comments
 (0)