c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: enable automatic iOS builds (#209)

Browse Source 
* refactor: enable automatic iOS builds

Part of https://github.com/ooni/probe/issues/1335

* fix: go mod tidy
This commit is contained in:
Simone Basso 2021-02-03 13:51:15 +01:00 committed by GitHub
parent b4c311cb45
commit c824612812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/engine/.github/workflows/ios.yml → .github/workflows/ios.yml vendored
View File

@ -15,4 +15,4 @@ jobs:
- run: ./build-ios.bash - run: ./build-ios.bash
- run: ./publish-ios.bash - run: ./publish-ios.bash
env: env:
BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }} MOBILE_BINTRAY_API_KEY: ${{ secrets.MOBILE_BINTRAY_API_KEY }}

2
MOBILE/ios/.gitignore vendored
View File

@ -1 +1 @@
/oonimkall.framework/

2
internal/engine/build-ios.bash → build-ios.bash
View File

@ -8,4 +8,4 @@ go get -u golang.org/x/mobile/cmd/gomobile
gomobile init gomobile init
export GO111MODULE=on export GO111MODULE=on
output=MOBILE/ios/oonimkall.framework output=MOBILE/ios/oonimkall.framework
gomobile bind -target=ios -o $output -ldflags="-s -w" ./oonimkall gomobile bind -target=ios -o $output -ldflags="-s -w" ./pkg/oonimkall

10
internal/engine/publish-ios.bash → publish-ios.bash
View File

@ -10,14 +10,14 @@ podspectemplate=./MOBILE/template.podspec
user=bassosimone user=bassosimone
(cd ./MOBILE/ios && rm -f $pkgname.framework.zip && zip -yr $pkgname.framework.zip $pkgname.framework) (cd ./MOBILE/ios && rm -f $pkgname.framework.zip && zip -yr $pkgname.framework.zip $pkgname.framework)
cat $podspectemplate|sed "s/@VERSION@/$version/g" > $podspecfile cat $podspectemplate|sed "s/@VERSION@/$version/g" > $podspecfile
if [ -z $BINTRAY_API_KEY ]; then if [ -z $MOBILE_BINTRAY_API_KEY ]; then
echo "FATAL: missing BINTRAY_API_KEY variable" 1>&2 echo "FATAL: missing MOBILE_BINTRAY_API_KEY variable" 1>&2
exit 1 exit 1
fi fi
# We currently publish the mobile-staging branch. To cleanup we can fetch all the versions using # We currently publish the mobile-staging branch. To cleanup we can fetch all the versions using
# the <curl -s $user:$BINTRAY_API_KEY https://api.bintray.com/packages/ooni/android/oonimkall> # the <curl -s $user:$MOBILE_BINTRAY_API_KEY https://api.bintray.com/packages/ooni/android/oonimkall>
# query, which returns a list of versions. From such list, we can delete the versions we # query, which returns a list of versions. From such list, we can delete the versions we
# don't need using <DELETE /packages/:subject/:repo/:package/versions/:version>. # don't need using <DELETE /packages/:subject/:repo/:package/versions/:version>.
curl -sT $frameworkzip -u $user:$BINTRAY_API_KEY $baseurl/$pkgname-$version.framework.zip?publish=1 >/dev/null curl -sT $frameworkzip -u $user:$MOBILE_BINTRAY_API_KEY $baseurl/$pkgname-$version.framework.zip?publish=1 >/dev/null
curl -sT $podspecfile -u $user:$BINTRAY_API_KEY $baseurl/$pkgname-$version.podspec?publish=1 >/dev/null curl -sT $podspecfile -u $user:$MOBILE_BINTRAY_API_KEY $baseurl/$pkgname-$version.podspec?publish=1 >/dev/null
echo "pod 'oonimkall', :podspec => 'https://dl.bintray.com/ooni/ios/$pkgname-$version.podspec'" echo "pod 'oonimkall', :podspec => 'https://dl.bintray.com/ooni/ios/$pkgname-$version.podspec'"