Skip to content

Commit

Permalink
Android support (#108)
Browse files Browse the repository at this point in the history
* Enabled s2n on android

* Added android-armv7 CI

* Updated to builder v0.6.1

* updated http to v0.5.2

* Updated s2n to 57147b6c99183c8b1e27068b53ce079eebc106cd
  • Loading branch information
Justin Boswell authored Apr 3, 2020
1 parent e84c340 commit 1549aaf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:
- '!master'

env:
BUILDER_VERSION: v0.5.9
BUILDER_VERSION: v0.6.1
BUILDER_SOURCE: releases
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
PACKAGE_NAME: aws-crt-cpp
LINUX_BASE_IMAGE: ubuntu-16-x64
Expand Down Expand Up @@ -74,15 +75,15 @@ jobs:
steps:
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
osx:
runs-on: macos-latest
steps:
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
chmod a+x builder
./builder build -p ${{ env.PACKAGE_NAME }} --spec=downstream
Expand All @@ -91,12 +92,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
arch: [linux-armv6, linux-armv7, linux-arm64]
arch: [linux-armv6, linux-armv7, linux-arm64, android-armv7]

steps:
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
chmod a+x builder
./builder build -p aws-crt-cpp --spec=downstream --target=${{matrix.arch}}
Expand Down
2 changes: 1 addition & 1 deletion aws-common-runtime/aws-c-common
2 changes: 1 addition & 1 deletion aws-common-runtime/s2n
Submodule s2n updated from bffd9b to 57147b
7 changes: 6 additions & 1 deletion builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
"imports": [
"s2n"
]
},
"android": {
"imports": [
"s2n"
]
}
},
"search_dirs": ["aws-common-runtime"],
Expand All @@ -22,4 +27,4 @@
}
}
}
}
}

0 comments on commit 1549aaf

Please sign in to comment.