Skip to content

Commit e2e1a79

Browse files
authored
Fixes to get main working downstream again (#841)
* Update base swift compiler to 20231016.5 The 20231016.5 is a new build based on 20231016.0 that has the fix for `static_assert(false` failure in Clang that was failing to compile Swift with updated MSVC c++ headers. * GHA workflow: add swift testing package name The build of swift testing now requires a specified package name, as swift testing uses the 'package' keyword. swift_testing the name used in the cmake build as well. * Do not attempt NuGet registration This is now failing as NuGet is registered: ``` Register-PackageSource: D:\r\_work\_temp\c04a7ca5-aa41-491b-b9ad-0e09fb799d0c.ps1:4 Line | 4 | Register-PackageSource -Name NuGet -Location https://www.nuget.or … | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | Package Source 'NuGet' exists. ``` https://github.com/thebrowsercompany/swift-build/actions/runs/11656344808/job/32454421580
1 parent 8166fd6 commit e2e1a79

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ jobs:
916916
github-repo: thebrowsercompany/swift-build
917917
github-token: ${{ secrets.GITHUB_TOKEN }}
918918
release-asset-name: installer-amd64.exe
919-
release-tag-name: '20240920.2'
919+
release-tag-name: '20231016.5'
920920

921921
- uses: nttld/setup-ndk@v1
922922
id: setup-ndk
@@ -1579,7 +1579,7 @@ jobs:
15791579
github-repo: thebrowsercompany/swift-build
15801580
github-token: ${{ secrets.GITHUB_TOKEN }}
15811581
release-asset-name: installer-amd64.exe
1582-
release-tag-name: '20240920.2'
1582+
release-tag-name: '20231016.5'
15831583

15841584
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
15851585
- uses: compnerd/gha-setup-vsdevenv@main
@@ -2271,7 +2271,7 @@ jobs:
22712271
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/Library/Testing-development/usr `
22722272
-D CMAKE_Swift_COMPILER=${SWIFTC} `
22732273
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple_no_api_level }} `
2274-
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr/lib/swift -L${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr/lib/swift/${{ matrix.os }} ${OVERLAY_FLAGS} ${{ matrix.swiftflags }}" `
2274+
-D CMAKE_Swift_FLAGS="-package-name swift_testing -resource-dir ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr/lib/swift -L${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr/lib/swift/${{ matrix.os }} ${OVERLAY_FLAGS} ${{ matrix.swiftflags }}" `
22752275
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
22762276
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `
22772277
-D CMAKE_SYSTEM_PROCESSOR=${CMAKE_CPU} `
@@ -3254,9 +3254,6 @@ jobs:
32543254
- name: Install WixToolset.Sdk
32553255
run: |
32563256
if ((Get-Package -Name WixToolset.Sdk -ErrorAction SilentlyContinue) -eq $null) {
3257-
if ([string]::IsNullOrEmpty((Get-PackageSource | %{ $_.Location } | Select-String -Pattern api.nuget.org))) {
3258-
Register-PackageSource -Name NuGet -Location https://www.nuget.org/api/v2 -ProviderName NuGet
3259-
}
32603257
Install-Package -Name WixToolset.Sdk -RequiredVersion 4.0.1 -Force
32613258
}
32623259
@@ -3434,9 +3431,6 @@ jobs:
34343431
- name: Install WixToolset.Sdk
34353432
run: |
34363433
if ((Get-Package -Name WixToolset.Sdk -ErrorAction SilentlyContinue) -eq $null) {
3437-
if ([string]::IsNullOrEmpty((Get-PackageSource | %{ $_.Location } | Select-String -Pattern api.nuget.org))) {
3438-
Register-PackageSource -Name NuGet -Location https://www.nuget.org/api/v2 -ProviderName NuGet
3439-
}
34403434
Install-Package -Name WixToolset.Sdk -RequiredVersion 4.0.1 -Force
34413435
}
34423436
@@ -3551,9 +3545,6 @@ jobs:
35513545
- name: Install WixToolset.Sdk
35523546
run: |
35533547
if ((Get-Package -Name WixToolset.Sdk -ErrorAction SilentlyContinue) -eq $null) {
3554-
if ([string]::IsNullOrEmpty((Get-PackageSource | %{ $_.Location } | Select-String -Pattern api.nuget.org))) {
3555-
Register-PackageSource -Name NuGet -Location https://www.nuget.org/api/v2 -ProviderName NuGet
3556-
}
35573548
Install-Package -Name WixToolset.Sdk -RequiredVersion 4.0.1 -Force
35583549
}
35593550

0 commit comments

Comments
 (0)