mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-31 02:31:07 +00:00
ci: Rename items specific to Windows + MSVCRT
This is necessary to prepare for introducing the new Windows + UCRT script and jobs.
This commit is contained in:
parent
17072f7005
commit
bd130db994
12
.github/workflows/ci.yml
vendored
12
.github/workflows/ci.yml
vendored
@ -343,14 +343,14 @@ jobs:
|
||||
run: |
|
||||
py -3 test/fuzz/test_runner.py --par $NUMBER_OF_PROCESSORS --loglevel DEBUG "${RUNNER_TEMP}/qa-assets/fuzz_corpora"
|
||||
|
||||
windows-cross:
|
||||
name: 'Windows-cross to x86_64'
|
||||
windows-msvcrt-cross:
|
||||
name: 'Windows-cross to x86_64, MSVCRT'
|
||||
needs: runners
|
||||
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' }}
|
||||
|
||||
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
|
||||
|
||||
steps:
|
||||
@ -387,10 +387,10 @@ jobs:
|
||||
${{ env.BASE_BUILD_DIR }}/src/univalue/*.exe
|
||||
${{ env.BASE_BUILD_DIR }}/test/config.ini
|
||||
|
||||
windows-native-test:
|
||||
name: 'Windows, test cross-built'
|
||||
windows-msvcrt-native-test:
|
||||
name: 'Windows, MSVCRT, test cross-built'
|
||||
runs-on: windows-2022
|
||||
needs: windows-cross
|
||||
needs: windows-msvcrt-cross
|
||||
|
||||
env:
|
||||
PYTHONUTF8: 1
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
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 HOST=x86_64-w64-mingw32
|
||||
export PACKAGES="g++-mingw-w64-x86-64-posix nsis"
|
||||
Loading…
x
Reference in New Issue
Block a user