Skip to content

Commit e7d782b

Browse files
committed
Use swift_package_test.yml workflow for build
1 parent 4f40876 commit e7d782b

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
7676
7777
- name: Install Prerequisites
78+
if: false
7879
run: |
7980
if [[ "${RUNNER_OS}" == "Linux" ]]; then
8081
# libcurl4-openssl-dev needed for host toolchain
@@ -83,6 +84,7 @@ jobs:
8384
8485
# swiftly install instructions from https://www.swift.org/install/linux/
8586
- name: Install Swiftly
87+
if: false
8688
run: |
8789
if [[ "${RUNNER_OS}" == "macOS" ]]; then
8890
curl -O https://download.swift.org/swiftly/darwin/swiftly.pkg && \
@@ -103,15 +105,19 @@ jobs:
103105
echo "${SWIFTLY_BIN_DIR}" >> "${GITHUB_PATH}"
104106
105107
- name: Install Swift Host Toolchain
108+
if: false
106109
run: swiftly install --use "${SWIFT_TOOLCHAIN_VERSION}"
107110

108111
- name: Install Swift SDK for Android
112+
if: false
109113
run: swift sdk install https://download.swift.org/development/android-sdk/${SWIFT_ANDROID_SDK_VERSION}-a/${SWIFT_ANDROID_SDK_VERSION}-a_android-0.1.artifactbundle.tar.gz --checksum ${SWIFT_ANDROID_SDK_CHECKSUM}
110114

111115
- name: List Swift SDKs
116+
if: false
112117
run: swift sdk list
113118

114119
- name: Install Android NDK
120+
if: false
115121
run: |
116122
mkdir ~/android-ndk
117123
cd ~/android-ndk
@@ -120,6 +126,7 @@ jobs:
120126
echo "ANDROID_NDK_HOME=${PWD}/android-ndk-${ANDROID_NDK_VERSION}" >> $GITHUB_ENV
121127
122128
- name: Setup Android Environment
129+
if: false
123130
run: |
124131
echo "$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/${{ env.ANDROID_BUILD_TOOLS_VERSION }}" >> $GITHUB_PATH
125132
# needed for Linux or else the emulator will be created in
@@ -129,16 +136,26 @@ jobs:
129136
fi
130137
131138
- name: Setup Swift SDK for Android
139+
if: false
132140
run: |
133141
cd ~/Library/org.swift.swiftpm || cd ${XDG_CONFIG_HOME}/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm
134142
./swift-sdks/${SWIFT_ANDROID_SDK_VERSION}-a-android-0.1.artifactbundle/swift-android/scripts/setup-android-sdk.sh
135143
136-
- name: Build Swift Executable for Android
144+
- name: Create Swift Package
145+
run: |
146+
swift package init --name hello --type executable
147+
148+
- name: Build Package for Android
149+
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
150+
with:
151+
enable_android_sdk_build: true
152+
#android_ndk_version: ${ANDROID_NDK_VERSION}
153+
enable_linux_checks: false
154+
enable_macos_checks: false
155+
enable_windows_checks: false
156+
157+
- name: Check Swift Package
137158
run: |
138-
mkdir hello
139-
cd hello
140-
swiftly run swift package init --type executable
141-
swiftly run swift build --swift-sdk "${ANDROID_EMULATOR_ARCH_TRIPLE}-unknown-linux-android${ANDROID_API}" --static-swift-stdlib
142159
file .build/debug/hello
143160
144161
- name: Enable KVM
@@ -190,7 +207,6 @@ jobs:
190207
191208
- name: Push Swift Executable to Android Emulator
192209
run: |
193-
cd hello
194210
adb push .build/debug/hello /data/local/tmp
195211
adb push $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/*/sysroot/usr/lib/${ANDROID_EMULATOR_ARCH_TRIPLE}-linux-android/libc++_shared.so /data/local/tmp/
196212

0 commit comments

Comments
 (0)