Skip to content

Commit 0eeae4d

Browse files
committed
Merge bitcoin/bitcoin#33625: Update secp256k1 subtree to latest master
3cbf7cb Squashed 'src/secp256k1/' changes from b9313c6e1a..d543c0d917 (fanquake) Pull request description: Updates the subtree to bitcoin-core/secp256k1@d543c0d Related to #33284. ACKs for top commit: hebasto: ACK 879c210. janb84: ACK 879c210 Tree-SHA512: 1802cd84959b5c935170792f458651f30431fe8340ead7966ff381c1c0c3a9f6c21bbb8dd96a07482ffed49642ded49e80b61802e688b8351956b111dffd5a78
2 parents d30f149 + 879c210 commit 0eeae4d

Some content is hidden

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

42 files changed

+1208
-585
lines changed

src/secp256k1/.github/actions/run-in-docker-action/action.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,35 @@ inputs:
44
dockerfile:
55
description: 'A Dockerfile that defines an image'
66
required: true
7-
tag:
8-
description: 'A tag of an image'
9-
required: true
7+
scope:
8+
description: 'A cached image scope'
9+
required: false
10+
default: ${{ runner.arch }}
1011
command:
1112
description: 'A command to run in a container'
12-
required: false
13-
default: ./ci/ci.sh
13+
required: true
1414
runs:
1515
using: "composite"
1616
steps:
1717
- uses: docker/setup-buildx-action@v3
1818

19-
- uses: docker/build-push-action@v5
19+
- uses: docker/build-push-action@v6
2020
id: main_builder
2121
continue-on-error: true
2222
with:
2323
context: .
2424
file: ${{ inputs.dockerfile }}
25-
tags: ${{ inputs.tag }}
2625
load: true
27-
cache-from: type=gha
26+
cache-from: type=gha,scope=${{ inputs.scope }}
2827

29-
- uses: docker/build-push-action@v5
28+
- uses: docker/build-push-action@v6
3029
id: retry_builder
3130
if: steps.main_builder.outcome == 'failure'
3231
with:
3332
context: .
3433
file: ${{ inputs.dockerfile }}
35-
tags: ${{ inputs.tag }}
3634
load: true
37-
cache-from: type=gha
35+
cache-from: type=gha,scope=${{ inputs.scope }}
3836

3937
- # Workaround for https://github.com/google/sanitizers/issues/1614 .
4038
# The underlying issue has been fixed in clang 18.1.3.
@@ -47,7 +45,8 @@ runs:
4745
$(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "--env \(.) "') \
4846
--volume ${{ github.workspace }}:${{ github.workspace }} \
4947
--workdir ${{ github.workspace }} \
50-
${{ inputs.tag }} bash -c "
48+
$(docker images -q | head -n1) \
49+
bash -c "
5150
git config --global --add safe.directory ${{ github.workspace }}
5251
${{ inputs.command }}
5352
"

0 commit comments

Comments
 (0)