Skip to content

Commit

Permalink
Merge pull request #318 from ooni/issue/1440c
Browse files Browse the repository at this point in the history
cleanup: remove mobile-staging and legacy build scripts
  • Loading branch information
bassosimone authored Apr 29, 2021
2 parents 7797330 + 4f52794 commit 958c3fe
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 78 deletions.
1 change: 0 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: android
on:
push:
branches:
- mobile-staging
- "release/**"
jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: "CodeQL"

on:
push:
branches: [ master, mobile-staging, 'release/**' ]
branches: [ master, 'release/**' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: ios
on:
push:
branches:
- mobile-staging
- 'release/**'
jobs:
test:
Expand Down
29 changes: 11 additions & 18 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,27 @@ This will generate a binary called `ooniprobe` in the current directory.
## Android bindings

```bash
./build-android.bash
./make -t android
```

We automatically build Android bindings whenever commits are pushed to the
`mobile-staging` branch. Such builds could be integrated by using:
Builds bindings for Android. (Add `----disable-embedding-psiphon-config` if you
cannot clone private repositories in the https://github.com/ooni namespace.)

```Groovy
implementation "org.ooni:oonimkall:VERSION"
```

Where VERSION is like `2020.03.30-231914` corresponding to the
time when the build occurred.
The generated bindings are (manually) pushed to the Maven Central package
repository. The instructions explaining how to integrate these bindings
are published along with the release notes.

## iOS bindings

```bash
./build-ios.bash
./make -t ios
```

We automatically build iOS bindings whenever commits are pushed to the
`mobile-staging` branch. Such builds could be integrated by using:

```ruby
pod 'oonimkall', :podspec => 'https://dl.bintray.com/ooni/ios/oonimkall-VERSION.podspec'
```
Builds bindings for iOS. (Add `----disable-embedding-psiphon-config` if you
cannot clone private repositories in the https://github.com/ooni namespace.)

Where VERSION is like `2020.03.30-231914` corresponding to the
time when the build occurred.
The generated bindings are (manually) added to GitHub releases. The instructions
explaining how to integrate these bindings are published along with the release notes.

## Updating dependencies

Expand Down
42 changes: 0 additions & 42 deletions build-android.bash

This file was deleted.

15 changes: 0 additions & 15 deletions build-ios.bash

This file was deleted.

0 comments on commit 958c3fe

Please sign in to comment.