From dba45c0b8c203184ecceb9bb2ebda3d1ddf829dc Mon Sep 17 00:00:00 2001 From: ComplexSpaces Date: Mon, 14 Mar 2022 11:19:55 -0500 Subject: [PATCH 1/3] Add support for Android --- .github/workflows/build.yaml | 2 ++ CHANGELOG.md | 3 +++ src/lib.rs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 826078e..c64e0e3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,6 +36,8 @@ jobs: # triple: x86_64-pc-windows-gnu - name: Linux triple: x86_64-unknown-linux-gnu + - name: Android + triple: aarch64-linux-android - name: macOS triple: x86_64-apple-darwin - name: FreeBSD diff --git a/CHANGELOG.md b/CHANGELOG.md index 05a56d7..5970aff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Unreleased +- Added support for Android + # 0.1.4 - Modified MacOS implementation to be friendly towards Apple app store review guidelines. diff --git a/src/lib.rs b/src/lib.rs index 7631ead..a3cc45d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,7 @@ use std::num::NonZeroUsize; -#[cfg_attr(target_os = "linux", path = "linux.rs")] +#[cfg_attr(any(target_os = "linux", target_os = "android"), path = "linux.rs")] #[cfg_attr(target_os = "freebsd", path = "freebsd.rs")] #[cfg_attr(target_os = "macos", path = "macos.rs")] mod imp; From 7e318b506f57f02ed0439e8197065d64209884b0 Mon Sep 17 00:00:00 2001 From: ComplexSpaces Date: Mon, 14 Mar 2022 12:53:00 -0500 Subject: [PATCH 2/3] Add support for iOS --- .github/workflows/build.yaml | 2 ++ CHANGELOG.md | 1 + Cargo.toml | 2 +- src/{macos.rs => apple.rs} | 0 src/lib.rs | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) rename src/{macos.rs => apple.rs} (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c64e0e3..4f8625f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,6 +40,8 @@ jobs: triple: aarch64-linux-android - name: macOS triple: x86_64-apple-darwin + - name: iOS + triple: aarch64-apple-ios - name: FreeBSD triple: x86_64-unknown-freebsd diff --git a/CHANGELOG.md b/CHANGELOG.md index 5970aff..a9520e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased - Added support for Android +- Added support for iOS # 0.1.4 diff --git a/Cargo.toml b/Cargo.toml index ddddf14..692bd67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,5 +14,5 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] -[target.'cfg(any(target_os = "macos", target_os = "freebsd"))'.dependencies] +[target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd"))'.dependencies] libc = "0.2.107" diff --git a/src/macos.rs b/src/apple.rs similarity index 100% rename from src/macos.rs rename to src/apple.rs diff --git a/src/lib.rs b/src/lib.rs index a3cc45d..c213802 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ use std::num::NonZeroUsize; #[cfg_attr(any(target_os = "linux", target_os = "android"), path = "linux.rs")] #[cfg_attr(target_os = "freebsd", path = "freebsd.rs")] -#[cfg_attr(target_os = "macos", path = "macos.rs")] +#[cfg_attr(any(target_os = "macos", target_os = "ios"), path = "apple.rs")] mod imp; /// Obtain the number of threads currently part of the active process. Returns `None` if the number From 9611a5e7848fefd67276ca1cbf8841ab4aa83c88 Mon Sep 17 00:00:00 2001 From: ComplexSpaces Date: Tue, 15 Mar 2022 00:37:02 -0500 Subject: [PATCH 3/3] Refactor check job to allow configuring CI host runner --- .github/workflows/build.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4f8625f..3e29a4f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,7 @@ on: jobs: check: name: Type checking (${{ matrix.target.name }}) - runs-on: ubuntu-latest + runs-on: ${{ matrix.target.host }} if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) || github.event_name == 'push' }} strategy: matrix: @@ -36,14 +36,19 @@ jobs: # triple: x86_64-pc-windows-gnu - name: Linux triple: x86_64-unknown-linux-gnu + host: ubuntu-latest - name: Android triple: aarch64-linux-android + host: ubuntu-latest - name: macOS triple: x86_64-apple-darwin + host: macos-latest - name: iOS triple: aarch64-apple-ios + host: macos-latest - name: FreeBSD triple: x86_64-unknown-freebsd + host: ubuntu-latest steps: - name: Checkout sources