Skip to content

Commit

Permalink
Temporary
Browse files Browse the repository at this point in the history
  • Loading branch information
hjyamauchi committed Dec 4, 2024
1 parent 9fae180 commit 12f9b63
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -790,12 +790,12 @@ jobs:
steps:
- uses: actions/download-artifact@v4
with:
name: installer-amd64-built-on-amd64
name: installer-amd64
path: ${{ github.workspace }}/tmp/amd64

- uses: actions/download-artifact@v4
with:
name: installer-arm64-built-on-amd64
name: installer-arm64
path: ${{ github.workspace }}/tmp/arm64

- name: Create Release
Expand Down
80 changes: 40 additions & 40 deletions .github/workflows/swift-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ env:

# Workaround for ... on Windows ARM64 preventing us from using the 5.10 toolchain release.
WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_REPO: thebrowsercompany/swift-build
WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE: 20231016.0
WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE: "20231016.0"

defaults:
run:
Expand Down Expand Up @@ -401,7 +401,7 @@ jobs:
ds2:
# TODO: Build this on macOS or make an equivalent Mac-only job
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: inputs.build_os == 'Windows' && inputs.build_arch == 'amd64'
needs: [ds2_tools]
runs-on: ${{ inputs.default_build_runner }}

Expand Down Expand Up @@ -938,7 +938,7 @@ jobs:
release-tag-name: ${{ env.WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}

- uses: nttld/setup-ndk@v1
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
id: setup-ndk
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}
Expand Down Expand Up @@ -1155,14 +1155,14 @@ jobs:
variant: sccache

- uses: nttld/setup-ndk@v1
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
id: setup-ndk
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}

- name: Configure zlib
run: |
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = "${{ steps.setup-ndk.outputs.ndk-path }}"
if ( "${{ inputs.build_os }}" -eq "Windows" ) {
$NDKPATH = cygpath -m $NDKPATH
Expand Down Expand Up @@ -1247,14 +1247,14 @@ jobs:
variant: sccache

- uses: nttld/setup-ndk@v1
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
id: setup-ndk
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}

- name: Configure curl
run: |
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = "${{ steps.setup-ndk.outputs.ndk-path }}"
if ( "${{ inputs.build_os }}" -eq "Windows" ) {
$NDKPATH = cygpath -m $NDKPATH
Expand Down Expand Up @@ -1411,14 +1411,14 @@ jobs:
variant: sccache

- uses: nttld/setup-ndk@v1
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
id: setup-ndk
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}

- name: Configure libxml2
run: |
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = "${{ steps.setup-ndk.outputs.ndk-path }}"
if ( "${{ inputs.build_os }}" -eq "Windows" ) {
$NDKPATH = cygpath -m $NDKPATH
Expand Down Expand Up @@ -1629,17 +1629,17 @@ jobs:

# NOTE(compnerd): we execute unconditionally as we reference outputs
- uses: nttld/setup-ndk@v1
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
id: setup-ndk
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}

- name: Configure LLVM
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
# NOTE: used by `matrix.cc`
$CLANG_CL = "cl"
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
$CMAKE_NDK_FLAG = "-DCMAKE_ANDROID_NDK=$NDKPATH"
$SWIFT_NDK_FLAG = "-DSWIFT_ANDROID_NDK_PATH=$NDKPATH"
Expand All @@ -1662,13 +1662,13 @@ jobs:
-D LLVM_ENABLE_ASSERTIONS=YES
- name: Configure Swift Standard Library
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
# NOTE: used by `matrix.cc`
$CLANG_CL = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
$SWIFTC = cygpath -m ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
$CMAKE_NDK_FLAG = "-DCMAKE_ANDROID_NDK=$NDKPATH"
$SWIFT_NDK_FLAG = "-DSWIFT_ANDROID_NDK_PATH=$NDKPATH"
Expand Down Expand Up @@ -1720,18 +1720,18 @@ jobs:
-D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=${{ github.workspace }}/SourceCache/swift-syntax `
-D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=${{ github.workspace }}/SourceCache/swift-experimental-string-processing
- name: Build Swift Standard Library
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
Remove-Item env:\SDKROOT
cmake --build ${{ github.workspace }}/BinaryCache/swift
- name: Install Swift Standard Library
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
Remove-Item env:\SDKROOT
cmake --build ${{ github.workspace }}/BinaryCache/swift --target install
- uses: actions/upload-artifact@v4
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
name: ${{ matrix.os }}-stdlib-${{ matrix.arch }}
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform
Expand Down Expand Up @@ -2013,17 +2013,17 @@ jobs:

steps:
- uses: actions/download-artifact@v4
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
name: libxml2-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.libxml2_version }}
path: ${{ github.workspace }}/BuildRoot/Library/libxml2-${{ inputs.libxml2_version }}/usr
- uses: actions/download-artifact@v4
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
name: curl-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.curl_version }}
path: ${{ github.workspace }}/BuildRoot/Library/curl-${{ inputs.curl_version }}/usr
- uses: actions/download-artifact@v4
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
name: zlib-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.zlib_version }}
path: ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
Expand All @@ -2034,7 +2034,7 @@ jobs:
name: compilers-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
name: ${{ matrix.os }}-stdlib-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform
Expand Down Expand Up @@ -2123,19 +2123,19 @@ jobs:

# NOTE(compnerd): we execute unconditionally as we reference outputs
- uses: nttld/setup-ndk@v1
if: inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
id: setup-ndk
with:
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}

- name: Configure libdispatch
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
# Workaround CMake 3.20 issue
$CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
$CMAKE_NDK_FLAG = "-DCMAKE_ANDROID_NDK=$NDKPATH"
$SWIFT_NDK_FLAG = "-DSWIFT_ANDROID_NDK_PATH=$NDKPATH"
Expand Down Expand Up @@ -2178,18 +2178,18 @@ jobs:
-D BUILD_TESTING=NO `
-D ENABLE_SWIFT=YES
- name: Build libdispatch
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/libdispatch
- name: Configure Foundation
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
# Workaround CMake 3.20 issue
$CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
$CMAKE_NDK_FLAG = "-DCMAKE_ANDROID_NDK=$NDKPATH"
$SWIFT_NDK_FLAG = "-DSWIFT_ANDROID_NDK_PATH=$NDKPATH"
Expand Down Expand Up @@ -2257,19 +2257,19 @@ jobs:
-D ZLIB_LIBRARY=${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr/lib/$LIBZ `
-D SwiftFoundation_MACRO=${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin
- name: Build foundation
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/foundation
# TODO(compnerd) correctly version XCTest
- name: Configure xctest
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
# Workaround CMake 3.20 issue
$CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
$CMAKE_NDK_FLAG = "-DCMAKE_ANDROID_NDK=$NDKPATH"
$SWIFT_NDK_FLAG = "-DSWIFT_ANDROID_NDK_PATH=$NDKPATH"
Expand Down Expand Up @@ -2312,18 +2312,18 @@ jobs:
-D Foundation_DIR=${{ github.workspace }}/BinaryCache/foundation/cmake/modules `
-D ENABLE_TESTING=NO
- name: Build xctest
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/xctest
- name: Configure Testing
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
# Workaround CMake 3.20 issue
$CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
if ( "${{ inputs.build_os }}" -ne "Windows" -or "${{ inputs.build_arch }}" -ne "arm64" ) {
if (-not ("${{ inputs.build_os }}" -eq "Windows" -and "${{ inputs.build_arch }}" -eq "arm64" )) {
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
$CMAKE_NDK_FLAG = "-DCMAKE_ANDROID_NDK=$NDKPATH"
$SWIFT_NDK_FLAG = "-DSWIFT_ANDROID_NDK_PATH=$NDKPATH"
Expand Down Expand Up @@ -2365,30 +2365,30 @@ jobs:
-D Foundation_DIR=${{ github.workspace }}/BinaryCache/foundation/cmake/modules `
-D SwiftTesting_MACRO=${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/TestingMacros.dll
- name: Build Testing
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/testing
- name: Install Testing
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/testing --target install
- name: Install xctest
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/xctest --target install
- name: Install foundation
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/foundation --target install
- name: Install libdispatch
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
run: |
cmake --build ${{ github.workspace }}/BinaryCache/libdispatch --target install
- uses: actions/setup-python@v5
- uses: jannekem/run-python-script-action@v1
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
script: |
import os
Expand All @@ -2406,7 +2406,7 @@ jobs:
plistlib.dump({ 'DefaultProperties': { 'DEFAULT_USE_RUNTIME': 'MD' } }, plist)
- uses: actions/upload-artifact@v4
if: matrix.os != 'Android' || inputs.build_os != 'Windows' || inputs.build_arch != 'arm64'
if: ${{ !(matrix.os == 'Android' && inputs.build_os == 'Windows' && inputs.build_arch == 'arm64') }}
with:
name: ${{ matrix.os }}-sdk-${{ matrix.arch }}
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform
Expand Down

0 comments on commit 12f9b63

Please sign in to comment.