mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-31 10:41:08 +00:00
Merge bitcoin/bitcoin#34446: [29.x] Backport CI changes
3835e16e5fe9d77d10fe1ce819157980dcea65f8 doc: update release notes for v29.x (fanquake) 6aec0958f12a65567a354a1d08d4bfed126cf34b ci: remove 3rd party js from windows dll gha job (Max Edwards) c57009eefcf30091d86fccaa07f0722f6f235cb9 chore: Update outdated GitHub Actions versions (Padraic Slattery) Pull request description: Backports: * #32513 (partial backport) * #34344 ACKs for top commit: willcl-ark: ACK 3835e16e5fe9d77d10fe1ce819157980dcea65f8 sedited: ACK 3835e16e5fe9d77d10fe1ce819157980dcea65f8 Tree-SHA512: e36b00e952fe6edbe931a131dbe66f14d97b2362453fe4a0e7be58697039945832075d486a6634228c4e1a0ab081e2919cf2c76ef2cfc8b2df6f321b6112c284
This commit is contained in:
commit
74bf92e5f4
2
.github/actions/configure-docker/action.yml
vendored
2
.github/actions/configure-docker/action.yml
vendored
@ -16,7 +16,7 @@ runs:
|
|||||||
|
|
||||||
# This is required to allow buildkit to access the actions cache
|
# This is required to allow buildkit to access the actions cache
|
||||||
- name: Expose actions cache variables
|
- name: Expose actions cache variables
|
||||||
uses: actions/github-script@v6
|
uses: actions/github-script@v8
|
||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
Object.keys(process.env).forEach(function (key) {
|
Object.keys(process.env).forEach(function (key) {
|
||||||
|
|||||||
28
.github/workflows/ci.yml
vendored
28
.github/workflows/ci.yml
vendored
@ -49,7 +49,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Determine fetch depth
|
- name: Determine fetch depth
|
||||||
run: echo "FETCH_DEPTH=$((${{ github.event.pull_request.commits }} + 2))" >> "$GITHUB_ENV"
|
run: echo "FETCH_DEPTH=$((${{ github.event.pull_request.commits }} + 2))" >> "$GITHUB_ENV"
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
ref: ${{ github.event.pull_request.head.sha }}
|
||||||
fetch-depth: ${{ env.FETCH_DEPTH }}
|
fetch-depth: ${{ env.FETCH_DEPTH }}
|
||||||
@ -125,7 +125,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- &CHECKOUT
|
- &CHECKOUT
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
# Ensure the latest merged pull request state is used, even on re-runs.
|
# Ensure the latest merged pull request state is used, even on re-runs.
|
||||||
ref: &CHECKOUT_REF_TMPL ${{ github.event_name == 'pull_request' && github.ref || '' }}
|
ref: &CHECKOUT_REF_TMPL ${{ github.event_name == 'pull_request' && github.ref || '' }}
|
||||||
@ -164,7 +164,7 @@ jobs:
|
|||||||
FILE_ENV: ${{ matrix.file-env }}
|
FILE_ENV: ${{ matrix.file-env }}
|
||||||
|
|
||||||
- name: Save Ccache cache
|
- name: Save Ccache cache
|
||||||
uses: actions/cache/save@v4
|
uses: actions/cache/save@v5
|
||||||
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
|
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
|
||||||
with:
|
with:
|
||||||
path: ${{ env.CCACHE_DIR }}
|
path: ${{ env.CCACHE_DIR }}
|
||||||
@ -198,11 +198,15 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- *CHECKOUT
|
- *CHECKOUT
|
||||||
|
|
||||||
- name: Configure Developer Command Prompt for Microsoft Visual C++
|
- name: Set up VS Developer Prompt
|
||||||
# Using microsoft/setup-msbuild is not enough.
|
shell: pwsh -Command "$PSVersionTable; $PSNativeCommandUseErrorActionPreference = $true; $ErrorActionPreference = 'Stop'; & '{0}'"
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
run: |
|
||||||
with:
|
$vswherePath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||||
arch: x64
|
$installationPath = & $vswherePath -latest -property installationPath
|
||||||
|
& "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x64 -no_logo && set" | foreach-object {
|
||||||
|
$name, $value = $_ -split '=', 2
|
||||||
|
echo "$name=$value" >> $env:GITHUB_ENV
|
||||||
|
}
|
||||||
|
|
||||||
- name: Get tool information
|
- name: Get tool information
|
||||||
run: |
|
run: |
|
||||||
@ -222,13 +226,13 @@ jobs:
|
|||||||
sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
|
sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
|
||||||
|
|
||||||
- name: vcpkg tools cache
|
- name: vcpkg tools cache
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v5
|
||||||
with:
|
with:
|
||||||
path: C:/vcpkg/downloads/tools
|
path: C:/vcpkg/downloads/tools
|
||||||
key: ${{ github.job }}-vcpkg-tools
|
key: ${{ github.job }}-vcpkg-tools
|
||||||
|
|
||||||
- name: Restore vcpkg binary cache
|
- name: Restore vcpkg binary cache
|
||||||
uses: actions/cache/restore@v4
|
uses: actions/cache/restore@v5
|
||||||
id: vcpkg-binary-cache
|
id: vcpkg-binary-cache
|
||||||
with:
|
with:
|
||||||
path: ~/AppData/Local/vcpkg/archives
|
path: ~/AppData/Local/vcpkg/archives
|
||||||
@ -239,7 +243,7 @@ jobs:
|
|||||||
cmake -B build --preset vs2022-static -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ${{ matrix.generate-options }}
|
cmake -B build --preset vs2022-static -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" ${{ matrix.generate-options }}
|
||||||
|
|
||||||
- name: Save vcpkg binary cache
|
- name: Save vcpkg binary cache
|
||||||
uses: actions/cache/save@v4
|
uses: actions/cache/save@v5
|
||||||
if: github.event_name != 'pull_request' && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
|
if: github.event_name != 'pull_request' && steps.vcpkg-binary-cache.outputs.cache-hit != 'true' && matrix.job-type == 'standard'
|
||||||
with:
|
with:
|
||||||
path: ~/AppData/Local/vcpkg/archives
|
path: ~/AppData/Local/vcpkg/archives
|
||||||
@ -414,7 +418,7 @@ jobs:
|
|||||||
CONTAINER_NAME: "bitcoin-linter"
|
CONTAINER_NAME: "bitcoin-linter"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
ref: *CHECKOUT_REF_TMPL
|
ref: *CHECKOUT_REF_TMPL
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|||||||
@ -73,8 +73,10 @@ Notable changes
|
|||||||
|
|
||||||
### Misc
|
### Misc
|
||||||
|
|
||||||
|
- #32513 ci: remove 3rd party js from windows dll gha job
|
||||||
- #33508 ci: fix buildx gha cache authentication on forks
|
- #33508 ci: fix buildx gha cache authentication on forks
|
||||||
- #33581 ci: Properly include $FILE_ENV in DEPENDS_HASH
|
- #33581 ci: Properly include $FILE_ENV in DEPENDS_HASH
|
||||||
|
- #34344 ci: update GitHub Actions versions
|
||||||
|
|
||||||
Credits
|
Credits
|
||||||
=======
|
=======
|
||||||
@ -90,6 +92,8 @@ Thanks to everyone who directly contributed to this release:
|
|||||||
- furszy
|
- furszy
|
||||||
- Hennadii Stepanov
|
- Hennadii Stepanov
|
||||||
- ismaelsadeeq
|
- ismaelsadeeq
|
||||||
|
- m3dwards
|
||||||
|
- Padraic Slattery
|
||||||
- Pieter Wuille
|
- Pieter Wuille
|
||||||
- SatsAndSports
|
- SatsAndSports
|
||||||
- willcl-ark
|
- willcl-ark
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user