Skip to content

Commit

Permalink
Merge pull request #86 from getlipa/develop
Browse files Browse the repository at this point in the history
Merge develop onto main
  • Loading branch information
danielgranhao authored Mar 15, 2023
2 parents 9408890 + c5233c6 commit 20d636b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
- main
- develop
pull_request:
schedule:
- cron: '21 2 * * 1-5' # every weekday at 2:21 AM UTC

env:
CARGO_TERM_COLOR: always
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
- main
- develop
pull_request:
schedule:
- cron: '21 2 * * 1-5' # every weekday at 2:21 AM UTC

jobs:
security-audit:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ on:
- main
- develop
pull_request:
schedule:
- cron: '21 2 * * 1-5' # every weekday at 2:21 AM UTC

jobs:
integration:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ honey-badger = { git = "https://github.com/getlipa/honey-badger", tag = "v1.0.1"
oslog = "0.2.0"

[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.12"
android_logger = "0.13"

[build-dependencies]
camino = "1.1.1"
Expand Down
8 changes: 8 additions & 0 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Temporary fix - Once we move to a newer cross version, this file can be removed.
# Checkout https://github.com/cross-rs/cross/issues/1217#issuecomment-1465167806 for details.
[target.aarch64-linux-android]
image = "ghcr.io/cross-rs/aarch64-linux-android:main"
[target.i686-linux-android]
image = "ghcr.io/cross-rs/i686-linux-android:main"
[target.x86_64-linux-android]
image = "ghcr.io/cross-rs/x86_64-linux-android:main"

0 comments on commit 20d636b

Please sign in to comment.