Skip to content

Conversation

etcwilde
Copy link
Member

@etcwilde etcwilde commented Sep 2, 2025

This extracts the version number computation out into a separate module to be shared between the runtimes.
Setting SWIFT_RUNTIME_VERSION allows external build orchestration tools to override the version number specified in source if necessary, while centralizing the location of the default version number across the runtime libraries.

@etcwilde
Copy link
Member Author

etcwilde commented Sep 2, 2025

@swift-ci please test

@etcwilde
Copy link
Member Author

etcwilde commented Sep 2, 2025

Fixes: #83936

@etcwilde
Copy link
Member Author

etcwilde commented Sep 4, 2025

@swift-ci please smoke test macOS

@etcwilde
Copy link
Member Author

etcwilde commented Sep 4, 2025

[2025-09-04T01:38:01.182Z] [769/5294][ 14%][43.438s] /usr/local/bin/sccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/llvm-macosx-x86_64/lib/CodeGen/AsmPrinter -I/Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/llvm-project/llvm/lib/CodeGen/AsmPrinter -I/Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/llvm-macosx-x86_64/include -I/Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/llvm-project/llvm/include -Wno-unknown-warning-option -Werror=unguarded-availability-new -arch x86_64 -target x86_64-apple-macosx13.0 -fno-stack-protector -fPIC -fvisibility-inlines-hidden -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wmisleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -O3 -DNDEBUG -std=c++17 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk -mmacosx-version-min=13.0  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -MD -MT lib/CodeGen/AsmPrinter/CMakeFiles/LLVMAsmPrinter.dir/DwarfCFIException.cpp.o -MF lib/CodeGen/AsmPrinter/CMakeFiles/LLVMAsmPrinter.dir/DwarfCFIException.cpp.o.d -o lib/CodeGen/AsmPrinter/CMakeFiles/LLVMAsmPrinter.dir/DwarfCFIException.cpp.o -c /Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/llvm-project/llvm/lib/CodeGen/AsmPrinter/DwarfCFIException.cpp
[2025-09-04T02:39:14.277Z] Cancelling nested steps due to timeout
[2025-09-04T02:39:14.279Z] Sending interrupt signal to process
[2025-09-04T02:39:24.464Z] ninja: build stopped: interrupted by user.

This is failing in a timeout while building LLVM. We're not to the point of building Swift so I think that this is unrelated to the PR.

This extracts the version number computation out into a separate module
to be shared between the runtimes.
Setting `SWIFT_RUNTIME_VERSION` allows external build orchestration
tools to override the version number specified in source if necessary,
while centralizing the location of the default version number across the
runtime libraries.
@etcwilde etcwilde force-pushed the ewilde/runtime-version-number branch from 5e172e2 to 0bebd9d Compare September 4, 2025 19:27
@etcwilde
Copy link
Member Author

etcwilde commented Sep 4, 2025

@swift-ci please smoke test

@etcwilde etcwilde merged commit f24f5de into swiftlang:main Sep 5, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants