Skip to content

Commit eb15534

Browse files
committed
Go back to building 6.2 and latest patches
1 parent 23c4993 commit eb15534

File tree

6 files changed

+31
-172
lines changed

6 files changed

+31
-172
lines changed

.github/workflows/pull_request.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,18 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- swift-version: 'development'
31+
- swift-version: 'swift-6.2-branch'
3232
build-type: 'docker'
3333
build-compiler: '1'
3434
runner: 'self-hosted'
35+
- swift-version: 'swift-6.2-branch'
36+
build-type: 'docker'
37+
build-compiler: '0'
38+
runner: 'ubuntu-24.04'
39+
- swift-version: 'development'
40+
build-type: 'docker'
41+
build-compiler: '0'
42+
runner: 'ubuntu-24.04'
3543
runs-on: ${{ matrix.runner }}
3644
# 15 hour timeout
3745
timeout-minutes: 900

swift-ci/sdks/android/patches/apply-patches.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ case "${BUILD_SCHEME}" in
1111
development)
1212
git apply -v -C1 ${patches_dir}/swift-android.patch
1313
git apply -v -C1 ${patches_dir}/swift-android-trunk-libdispatch.patch
14-
git apply -v ${patches_dir}/swift-android-trunk-old-tag.patch
1514
;;
1615
*)
1716
echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"

swift-ci/sdks/android/patches/swift-android-devel.patch

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,6 @@ index f7f2664b2de..01d36e127c6 100644
118118

119119
// CHECK-DISABLED-NOT: normal_count
120120

121-
diff --git a/swift/test/SILOptimizer/concat_string_literals.32.swift b/swift/test/SILOptimizer/concat_string_literals.32.swift
122-
index 01390761c8c..d84c142397c 100644
123-
--- a/swift/test/SILOptimizer/concat_string_literals.32.swift
124-
+++ b/swift/test/SILOptimizer/concat_string_literals.32.swift
125-
@@ -4,6 +4,7 @@
126-
127-
// We have a separate test for 64-bit architectures.
128-
// REQUIRES: PTRSIZE=32
129-
+// XFAIL: OS=linux-androideabi
130-
131-
// NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
132-
// CHECK-LABEL: test_ascii_scalar_scalar2
133121
diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
134122
index bfb69965890..b5e9f5349c2 100644
135123
--- a/swift/utils/swift_build_support/swift_build_support/cmake.py

swift-ci/sdks/android/patches/swift-android-trunk-libdispatch.patch

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swif
1414
index 9a0f5b43e2d..5c7d1320a2d 100644
1515
--- a/swift/utils/swift_build_support/swift_build_support/cmake.py
1616
+++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
17-
@@ -153,10 +153,8 @@ class CMake(object):
18-
toolchain_path = product.native_toolchain_path(args.host_target)
19-
cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
20-
os.path.join(toolchain_path, 'bin', 'swiftc'))
21-
- define("CMAKE_C_COMPILER:PATH", os.path.join(toolchain_path,
17+
@@ -150,11 +150,8 @@ class CMake(object):
18+
define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
19+
20+
if self.prefer_native_toolchain and product:
21+
- clang_tools_path = product.native_clang_tools_path(args.host_target)
22+
- define("CMAKE_C_COMPILER:PATH", os.path.join(clang_tools_path,
2223
- 'bin', 'clang'))
23-
- define("CMAKE_CXX_COMPILER:PATH", os.path.join(toolchain_path,
24+
- define("CMAKE_CXX_COMPILER:PATH", os.path.join(clang_tools_path,
2425
- 'bin', 'clang++'))
2526
+ define("CMAKE_C_COMPILER:PATH", toolchain.cc)
2627
+ define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
27-
define("CMAKE_Swift_COMPILER:PATH", cmake_swiftc_path)
28-
else:
29-
cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER', toolchain.swiftc)
28+
29+
toolchain_path = product.native_toolchain_path(args.host_target)
30+
cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
3031
diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
3132
index 3da519e..e2dd8ed 100644
3233
--- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake

swift-ci/sdks/android/patches/swift-android-trunk-old-tag.patch

Lines changed: 0 additions & 149 deletions
This file was deleted.

swift-ci/sdks/android/patches/swift-android.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
diff --git a/swift/test/SILOptimizer/concat_string_literals.32.swift b/swift/test/SILOptimizer/concat_string_literals.32.swift
2+
index 01390761c8c..d84c142397c 100644
3+
--- a/swift/test/SILOptimizer/concat_string_literals.32.swift
4+
+++ b/swift/test/SILOptimizer/concat_string_literals.32.swift
5+
@@ -4,6 +4,7 @@
6+
7+
// We have a separate test for 64-bit architectures.
8+
// REQUIRES: PTRSIZE=32
9+
+// XFAIL: OS=linux-androideabi
10+
11+
// NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
12+
// CHECK-LABEL: test_ascii_scalar_scalar2
113
diff --git a/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil b/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil
214
index 98765e0e4a3..4dc68bf522b 100644
315
--- a/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil

0 commit comments

Comments
 (0)