This fixes an incorrect conflict resolution problem that happened
in
0cdc3a575d14d710045084a615ef7f2536423727 while backporting
PR #97533 as PR #107115 (merged prematurely). This problem caused
GitHub Actions CI/CD to crash while attempting to load the workflow
file definition, preventing the jobs that are defined in
`.github/workflows/build.yml` from actually starting.
- build_macos
- build_ubuntu
- build_ubuntu_ssltests
- - test_hypothesis
- build_asan
runs-on: ubuntu-latest
build_macos,
build_ubuntu_ssltests,
build_win32,
- test_hypothesis,
allowed-skips: >-
${{
!fromJSON(needs.check_source.outputs.run-docs)
'
|| ''
}}
- ${{
- !fromJSON(needs.check_source.outputs.run_hypothesis)
- && '
- test_hypothesis,
- '
- || ''
- }}
jobs: ${{ toJSON(needs) }}