-
Notifications
You must be signed in to change notification settings - Fork 15
[swift-build] Update vm images - no Python 3.9 #302
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mhegazy
wants to merge
8
commits into
main
Choose a base branch
from
mhegazy/vm-images-no-python
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
523ef01
Update vm images
mhegazy 582019a
Add explicit step to setup python
mhegazy 62332ad
compilers: Add lib2 version to CMake configuration
Steelskin f1503d0
early-swift-driver: Update bootstrap toolchain
Steelskin a3cf65c
Added new action to install python and install depenencies.
mhegazy e53a599
Add explicit step to setup python
mhegazy da89211
Merge branch 'main' into mhegazy/vm-images-no-python
mhegazy 856213b
Merge branch 'setup-python-action' into mhegazy/vm-images-no-python
mhegazy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -284,6 +284,10 @@ env: | |
| WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO: thebrowsercompany/swift-build | ||
| WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_VERSION: 6.0.0-20241216.0 | ||
|
|
||
| # Workaround to build the early swift-driver without the workaround for the MSVC version. | ||
| WORKAROUND_WINDOWS_EARLY_SWIFT_DRIVER_TOOLCHAIN_REPO: thebrowsercompany/swift-build | ||
| WORKAROUND_WINDOWS_EARLY_SWIFT_DRIVER_TOOLCHAIN_VERSION: 6.2.0-20250630.0 | ||
|
|
||
| # Workaround for issues with building with MSVC 14.43. | ||
| # See https://github.com/swiftlang/swift/issues/79852 for details. | ||
| # TODO: Remove this once the bootstrap toolchain is updated to 6.1. | ||
|
|
@@ -682,7 +686,10 @@ jobs: | |
| ref: ${{ inputs.swift_revision }} | ||
| path: ${{ github.workspace }}/SourceCache/swift | ||
| show-progress: false | ||
|
|
||
| - name: Setup python | ||
| uses: ./SourceCache/ci-build/.github/actions/setup-python | ||
| with: | ||
| repo-root: ${{ github.workspace }}/SourceCache/ci-build | ||
| - name: Configure Tools | ||
| run: | | ||
| cmake -B ${{ github.workspace }}/BinaryCache/0 ` | ||
|
|
@@ -782,10 +789,9 @@ jobs: | |
| - uses: ./SourceCache/ci-build/.github/actions/setup-build | ||
| id: setup-build | ||
| with: | ||
| msvc-version: ${{ env.WORKAROUND_BOOTSTRAP_WINDOWS_MSVC_VERSION }} | ||
| host-arch: ${{ matrix.arch }} | ||
| swift-version: ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_VERSION || env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} | ||
| swift-repo: ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO || '' }} | ||
| swift-version: ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_EARLY_SWIFT_DRIVER_TOOLCHAIN_VERSION || env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} | ||
| swift-repo: ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_EARLY_SWIFT_DRIVER_TOOLCHAIN_REPO || '' }} | ||
|
|
||
| - uses: actions/[email protected] | ||
| with: | ||
|
|
@@ -821,14 +827,8 @@ jobs: | |
| - name: Build early swift-driver | ||
| run: | | ||
| $env:SWIFTCI_USE_LOCAL_DEPS=1 | ||
| $BuildToolsVersion = "${{ steps.setup-build.outputs.windows-build-tools-version }}" | ||
| $ExtraFlags = if ($BuildToolsVersion -ne "") { | ||
| @("-Xlinker", "${env:SDKROOT}/usr/lib/swift/windows/${{ matrix.cpu }}/swiftCore.lib", | ||
| "-Xswiftc", "-visualc-tools-version", "-Xswiftc", "${BuildToolsVersion}", | ||
| "-Xbuild-tools-swiftc", "-visualc-tools-version", "-Xbuild-tools-swiftc", "${BuildToolsVersion}", | ||
| "-Xcc", "-Xmicrosoft-visualc-tools-version", "-Xcc", "${BuildToolsVersion}", | ||
| "-Xcxx", "-Xmicrosoft-visualc-tools-version", "-Xcxx", "${BuildToolsVersion}" | ||
| ) | ||
| $ExtraFlags = if ("${{ matrix.os }}" -eq "Windows") { | ||
| @("-Xlinker", "${env:SDKROOT}/usr/lib/swift/windows/${{ matrix.cpu }}/swiftCore.lib") | ||
| } else { | ||
| @() | ||
| } | ||
|
|
@@ -1134,6 +1134,7 @@ jobs: | |
| -D CLANG_VENDOR_UTI=org.compnerd.dt ` | ||
| -D cmark-gfm_DIR=${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake ` | ||
| -D LibXml2_DIR=${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr/lib/cmake/libxml2-${{ inputs.libxml2_version }} ` | ||
| -D LLDB_LIBXML2_VERSION="${{ inputs.libxml2_version }}" ` | ||
| -D PACKAGE_VENDOR=compnerd.org ` | ||
| -D SWIFT_VENDOR=compnerd.org ` | ||
| -D LLVM_PARALLEL_LINK_JOBS=8 ` | ||
|
|
@@ -1162,7 +1163,11 @@ jobs: | |
| Copy-Item -Path "${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/*.dylib" -Destination "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr/lib/swift/host/compiler" | ||
| } | ||
|
|
||
| - uses: actions/setup-python@v5 | ||
| - name: Setup python | ||
| uses: ./SourceCache/ci-build/.github/actions/setup-python | ||
| with: | ||
| repo-root: ${{ github.workspace }}/SourceCache/ci-build | ||
|
|
||
| - uses: jannekem/run-python-script-action@v1 | ||
| with: | ||
| script: | | ||
|
|
@@ -1676,6 +1681,11 @@ jobs: | |
| ndk-version: ${{ inputs.ANDROID_NDK_VERSION }} | ||
| local-cache: true | ||
|
|
||
| - name: Setup python | ||
| uses: ./SourceCache/ci-build/.github/actions/setup-python | ||
| with: | ||
| repo-root: ${{ github.workspace }}/SourceCache/ci-build | ||
|
|
||
| - name: Configure LLVM | ||
| if: matrix.os != 'Android' || inputs.build_android | ||
| run: | | ||
|
|
@@ -2553,7 +2563,11 @@ jobs: | |
| run: | | ||
| cmake --build ${{ github.workspace }}/BinaryCache/libdispatch --target install | ||
|
|
||
| - uses: actions/setup-python@v5 | ||
| - name: Setup python | ||
| uses: ./SourceCache/ci-build/.github/actions/setup-python | ||
| with: | ||
| repo-root: ${{ github.workspace }}/SourceCache/ci-build | ||
|
|
||
| - uses: jannekem/run-python-script-action@v1 | ||
| if: matrix.os != 'Android' || inputs.build_android | ||
| with: | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should have this upstream. Is there a reason why this cannot be upstream?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
upstream PR: compnerd/swift-build#983