cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-31 10:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Rename items specific to Windows + MSVCRT

Browse Source 
This is necessary to prepare for introducing the new Windows + UCRT
script and jobs.
This commit is contained in:
Hennadii Stepanov 2025-11-21 14:26:59 +00:00
parent 17072f7005
commit bd130db994
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -343,14 +343,14 @@ jobs:
run: | run: |
py -3 test/fuzz/test_runner.py --par $NUMBER_OF_PROCESSORS --loglevel DEBUG "${RUNNER_TEMP}/qa-assets/fuzz_corpora" py -3 test/fuzz/test_runner.py --par $NUMBER_OF_PROCESSORS --loglevel DEBUG "${RUNNER_TEMP}/qa-assets/fuzz_corpora"
windows-cross: windows-msvcrt-cross:
name: 'Windows-cross to x86_64' name: 'Windows-cross to x86_64, MSVCRT'
needs: runners needs: runners
runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm' || 'ubuntu-24.04' }} runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm' || 'ubuntu-24.04' }}
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }} if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
env: env:
FILE_ENV: './ci/test/00_setup_env_win64.sh' FILE_ENV: './ci/test/00_setup_env_win64_msvcrt.sh'
DANGER_CI_ON_HOST_FOLDERS: 1 DANGER_CI_ON_HOST_FOLDERS: 1
steps: steps:
@ -387,10 +387,10 @@ jobs:
${{ env.BASE_BUILD_DIR }}/src/univalue/*.exe ${{ env.BASE_BUILD_DIR }}/src/univalue/*.exe
${{ env.BASE_BUILD_DIR }}/test/config.ini ${{ env.BASE_BUILD_DIR }}/test/config.ini
windows-native-test: windows-msvcrt-native-test:
name: 'Windows, test cross-built' name: 'Windows, MSVCRT, test cross-built'
runs-on: windows-2022 runs-on: windows-2022
needs: windows-cross needs: windows-msvcrt-cross
env: env:
PYTHONUTF8: 1 PYTHONUTF8: 1

2
ci/test/00_setup_env_win64.sh → ci/test/00_setup_env_win64_msvcrt.sh
View File

@ -6,7 +6,7 @@
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export CONTAINER_NAME=ci_win64 export CONTAINER_NAME=ci_win64_msvcrt
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" # Check that https://packages.ubuntu.com/noble/g++-mingw-w64-x86-64-posix (version 13.x, similar to guix) can cross-compile export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" # Check that https://packages.ubuntu.com/noble/g++-mingw-w64-x86-64-posix (version 13.x, similar to guix) can cross-compile
export HOST=x86_64-w64-mingw32 export HOST=x86_64-w64-mingw32
export PACKAGES="g++-mingw-w64-x86-64-posix nsis" export PACKAGES="g++-mingw-w64-x86-64-posix nsis"