Skip to content

Commit 2e77313

Browse files
committed
1 parent a1a3dbe commit 2e77313

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

.github/workflows/android-release-artifacts.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ on:
1515
type: choice
1616
options:
1717
- "xnnpack"
18-
- "vulkan+xnnpack"
18+
- "vulkan"
1919
- "qnn"
2020
schedule:
2121
- cron: 0 10 * * *
2222

23-
concurrency:
24-
group: ${{ github.workflow }}-${{ github.ref }}
25-
cancel-in-progress: true
26-
2723
jobs:
2824
check-if-aar-exists:
2925
name: check-if-aar-exists
@@ -34,12 +30,13 @@ jobs:
3430
shell: bash
3531
run: |
3632
VERSION="${{ inputs.version }}"
33+
FLAVOR="${{ inputs.flavor }}"
3734
if [ -z "$VERSION" ]; then
3835
echo "No version name specified. Will create a snapshot AAR"
3936
exit 0
4037
fi
41-
if curl -I "https://ossci-android.s3.amazonaws.com/executorch/release/${VERSION}/executorch.aar" | grep "200 OK"; then
42-
echo "AAR already exists at https://ossci-android.s3.amazonaws.com/executorch/release/${VERSION}/executorch.aar"
38+
if curl -I "https://ossci-android.s3.amazonaws.com/executorch/release/${VERSION}-${FLAVOR}/executorch.aar" | grep "200 OK"; then
39+
echo "AAR already exists at https://ossci-android.s3.amazonaws.com/executorch/release/${VERSION}-${FLAVOR}/executorch.aar"
4340
echo "Will skip build/upload"
4441
exit 1
4542
fi
@@ -93,7 +90,7 @@ jobs:
9390
fi
9491
9592
FLAVOR="${{ inputs.flavor }}"
96-
if [[ "$FLAVOR" == "vulkan+xnnpack" || -z "$FLAVOR" ]]; then
93+
if [[ "$FLAVOR" == "vulkan" || -z "$FLAVOR" ]]; then
9794
curl -O https://sdk.lunarg.com/sdk/download/1.4.321.1/linux/vulkansdk-linux-x86_64-1.4.321.1.tar.xz
9895
tar xf vulkansdk-linux-x86_64-1.4.321.1.tar.xz -C /tmp
9996
export PATH="/tmp/1.4.321.1/x86_64/bin:$PATH"
@@ -148,8 +145,12 @@ jobs:
148145
pip install awscli==1.32.18
149146
AWS_CMD="aws s3 cp"
150147
VERSION="${{ inputs.version }}"
148+
FLAVOR="${{ inputs.flavor }}"
151149
if [ -z "$VERSION" ]; then
152150
VERSION="snapshot-$(date +"%Y%m%d")"
153151
fi
154-
${AWS_CMD} executorch.aar s3://ossci-android/executorch/release/${VERSION}/executorch.aar --acl public-read
155-
${AWS_CMD} executorch.aar.sha256sums s3://ossci-android/executorch/release/${VERSION}/executorch.aar.sha256sums --acl public-read
152+
if [ -z "$FLAVOR" ]; then
153+
FLAVOR="xnnpack"
154+
fi
155+
${AWS_CMD} executorch.aar s3://ossci-android/executorch/release/${VERSION}-${FLAVOR}/executorch.aar --acl public-read
156+
${AWS_CMD} executorch.aar.sha256sums s3://ossci-android/executorch/release/${VERSION}-${FLAVOR}/executorch.aar.sha256sums --acl public-read

0 commit comments

Comments
 (0)