Skip to content

Commit 512b4fa

Browse files
SteelskinSteelskin
committed
Android: Update Android platform packaging
This modifies the package Android platform job to handle the changes in swiftlang/swift-installer-scripts#406.
1 parent dd6a3af commit 512b4fa

File tree

1 file changed

+68
-19
lines changed

1 file changed

+68
-19
lines changed

‎.github/workflows/swift-toolchain.yml

Lines changed: 68 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4090,52 +4090,98 @@ jobs:
40904090
- if: inputs.build_android
40914091
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
40924092
with:
4093-
name: Android-${{ matrix.arch }}-stdlib
4093+
name: Android-arm64-stdlib
40944094
path: ${{ github.workspace }}/BuildRoot/Library
40954095
- if: inputs.build_android
40964096
uses: actions/download-artifact@v4
40974097
with:
4098-
name: Android-${{ matrix.arch }}-sdk
4098+
name: Android-arm64-sdk
40994099
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform
4100+
- if: inputs.build_android
4101+
uses: actions/download-artifact@v4
4102+
with:
4103+
name: Android-arm64-ds2
4104+
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/Library
4105+
- if: inputs.build_android
4106+
run: |
4107+
New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule -Force
4108+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/aarch64/Dispatch.swiftdoc ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/aarch64-unknown-linux-android.swiftdoc
4109+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/aarch64/Dispatch.swiftmodule ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/aarch64-unknown-linux-android.swiftmodule
4110+
4111+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.so" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/aarch64/
4112+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.a" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/aarch64/
41004113
41014114
- if: inputs.build_android
41024115
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
41034116
with:
4104-
name: Android-${{ matrix.arch }}-stdlib
4117+
name: Android-armv7-stdlib
41054118
path: ${{ github.workspace }}/BuildRoot/Library
41064119
- if: inputs.build_android
41074120
uses: actions/download-artifact@v4
41084121
with:
4109-
name: Android-${{ matrix.arch }}-sdk
4122+
name: Android-armv7-sdk
41104123
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform
4124+
- if: inputs.build_android
4125+
uses: actions/download-artifact@v4
4126+
with:
4127+
name: Android-armv7-ds2
4128+
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/Library
4129+
- if: inputs.build_android
4130+
run: |
4131+
New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule -Force
4132+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/armv7/Dispatch.swiftdoc ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/armv7-unknown-linux-android.swiftdoc
4133+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/armv7/Dispatch.swiftmodule ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/armv7-unknown-linux-android.swiftmodule
4134+
4135+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.so" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/armv7/
4136+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.a" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/armv7/
41114137
41124138
- if: inputs.build_android
41134139
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
41144140
with:
4115-
name: Android-${{ matrix.arch }}-stdlib
4141+
name: Android-x86_64-stdlib
41164142
path: ${{ github.workspace }}/BuildRoot/Library
41174143
- if: inputs.build_android
41184144
uses: actions/download-artifact@v4
41194145
with:
4120-
name: Android-${{ matrix.arch }}-sdk
4146+
name: Android-x86_64-sdk
41214147
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform
4148+
- if: inputs.build_android
4149+
uses: actions/download-artifact@v4
4150+
with:
4151+
name: Android-x86_64-ds2
4152+
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/Library
4153+
- if: inputs.build_android
4154+
run: |
4155+
New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule -Force
4156+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/x86_64/Dispatch.swiftdoc ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/x86_64-unknown-linux-android.swiftdoc
4157+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/x86_64/Dispatch.swiftmodule ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/x86_64-unknown-linux-android.swiftmodule
4158+
4159+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.so" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/x86_64/
4160+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.a" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/x86_64/
41224161
41234162
- if: inputs.build_android
41244163
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
41254164
with:
4126-
name: Android-${{ matrix.arch }}-stdlib
4165+
name: Android-i686-stdlib
41274166
path: ${{ github.workspace }}/BuildRoot/Library
41284167
- if: inputs.build_android
41294168
uses: actions/download-artifact@v4
41304169
with:
4131-
name: Android-${{ matrix.arch }}-sdk
4170+
name: Android-i686-sdk
41324171
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform
4133-
41344172
- if: inputs.build_android
41354173
uses: actions/download-artifact@v4
41364174
with:
4137-
name: Android-${{ matrix.arch }}-ds2
4175+
name: Android-i686-ds2
41384176
path: ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/Library
4177+
- if: inputs.build_android
4178+
run: |
4179+
New-Item -ItemType Directory -Path ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule -Force
4180+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/i686/Dispatch.swiftdoc ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/i686-unknown-linux-android.swiftdoc
4181+
Move-Item ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/Android/i686/Dispatch.swiftmodule ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/Dispatch.swiftmodule/i686-unknown-linux-android.swiftmodule
4182+
4183+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.so" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/i686/
4184+
Move-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/lib*.a" -Destination ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk/usr/lib/swift/android/i686/
41394185
41404186
- if: inputs.build_android
41414187
uses: actions/[email protected]
@@ -4150,7 +4196,7 @@ jobs:
41504196
with:
41514197
host_arch: ${{ inputs.build_arch }}
41524198
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
4153-
arch: ${{ matrix.arch }}
4199+
arch: ${{ inputs.build_arch }}
41544200
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
41554201

41564202
- if: inputs.build_android && inputs.signed
@@ -4183,22 +4229,25 @@ jobs:
41834229
-p:BaseOutputPath=${{ github.workspace }}\BinaryCache\installer\ `
41844230
-p:Configuration=Release `
41854231
-p:SignOutput=${{ inputs.signed }} `
4186-
-p:ANDROID_INCLUDE_DS2=${{ inputs.build_android }} `
4232+
-p:ANDROID_INCLUDE_DS2=true `
41874233
-p:CERTIFICATE=${env:CERTIFICATE} `
41884234
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
4189-
-p:PLATFORM_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform `
4190-
-p:SDK_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform/Developer/SDKs/Android.sdk `
4235+
-p:ImageRoot=${{ github.workspace }}/BuildRoot/Library `
41914236
-p:ProductVersion=${{ inputs.swift_version }} `
4192-
-p:ProductArchitecture=${{ matrix.msarch }} `
4193-
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/sdk/drd/sdk.wixproj
4237+
-p:AndroidArchitectures="`"x86_64;aarch64;i686;armv7`"" `
4238+
${{ github.workspace }}/SourceCache/swift-installer-scripts/platforms/Windows/platforms/android/android.wixproj
41944239
41954240
- if: inputs.build_android
41964241
uses: actions/upload-artifact@v4
41974242
with:
4198-
name: Android-${{ matrix.arch }}-sdk-msi
4243+
name: Android-platform-msi
41994244
path: |
4200-
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.msarch }}/sdk.android.${{ matrix.msarch }}.msi
4201-
${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.msarch }}/sdk.android.${{ matrix.msarch }}.cab
4245+
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/android.msi
4246+
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/android.cab
4247+
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/sdk.android.arm64.cab
4248+
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/sdk.android.arm.cab
4249+
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/sdk.android.x64.cab
4250+
${{ github.workspace }}/BinaryCache/installer/Release/${{ inputs.build_arch }}/sdk.android.x86.cab
42024251
42034252
installer:
42044253
# TODO: Build this on macOS or make an equivalent Mac-only job

0 commit comments

Comments
 (0)