Skip to content

Commit b30a44b

Browse files
committed
Move NDK version substitution on CI that's no longer needed for trunk
1 parent 2f2854e commit b30a44b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/workflows/sdks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,17 @@ jobs:
128128
git apply swift-android.patch swift-android-ci.patch swift-crypto.patch swift-system.patch
129129
if [ ${{ matrix.version }} = 'release' ]; then
130130
git apply swift-android-ci-release.patch swift-android-foundation-release.patch
131+
perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
131132
else
132133
if [ ${{ matrix.version }} = 'devel' ]; then
133134
git apply swift-android-foundation-devel.patch
135+
perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
134136
else
135137
git apply swift-android-foundation-trunk.patch
136138
fi
137139
git apply swift-android-ci-except-release.patch swift-android-foundation-except-release.patch
138140
fi
139141
140-
perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
141142
perl -pi -e 's%String\(cString: getpass%\"fake\" //%' swiftpm/Sources/PackageRegistryCommand/PackageRegistryCommand+Auth.swift
142143
143144
VERSION="$(echo ${{ steps.version.outputs.tag }} | cut -f1,2 -d-)-${{ matrix.version }}"

0 commit comments

Comments
 (0)