Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .cursor/rules/cicd-patterns.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ When adding new CI checks:
## Environment Variables in CI

- `RUSTFLAGS: -Dwarnings` enforced in CI
- Feature flag testing: `-Funstable-mobile-app`
- Cross-platform matrix: Ubuntu 24.04, macOS 14, Windows 2022
9 changes: 2 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- x86_64-pc-windows-msvc
- aarch64-apple-darwin
- x86_64-apple-darwin
feature-args: ['', '-Funstable-mobile-app']
include:
- target: x86_64-unknown-linux-musl
os: ubuntu-24.04
Expand All @@ -34,12 +33,8 @@ jobs:
- target: x86_64-apple-darwin
os: macos-14
display-os: macOS – x86_64
- feature-args: ''
feature-suffix: ''
- feature-args: '-Funstable-mobile-app'
feature-suffix: ' (-Funstable-mobile-app)'

name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
name: ${{ matrix.display-os }}
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repository
Expand All @@ -64,4 +59,4 @@ jobs:
run: cargo fmt --all -- --check

- name: Run Clippy
run: cargo clippy --workspace --tests --target ${{ matrix.target }} ${{ matrix.feature-args }}
run: cargo clippy --workspace --tests --target ${{ matrix.target }}
9 changes: 2 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- x86_64-pc-windows-msvc
- aarch64-apple-darwin
- x86_64-apple-darwin
feature-args: ['', '-Funstable-mobile-app']
include:
- target: x86_64-unknown-linux-musl
os: ubuntu-24.04
Expand All @@ -34,12 +33,8 @@ jobs:
- target: x86_64-apple-darwin
os: macos-14
display-os: macOS – x86_64
- feature-args: ''
feature-suffix: ''
- feature-args: '-Funstable-mobile-app'
feature-suffix: ' (-Funstable-mobile-app)'

name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
name: ${{ matrix.display-os }}
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -59,4 +54,4 @@ jobs:
uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0

- name: Run Cargo Tests
run: cargo test --workspace --target ${{ matrix.target }} ${{ matrix.feature-args }}
run: cargo test --workspace --target ${{ matrix.target }}
3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"rust-analyzer.cargo.features": ["unstable-mobile-app"],
"rust-analyzer.cargo.noDefaultFeatures": false,
"rust-analyzer.check.command": "clippy"
}
}
8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ rust-version = "1.86"
[dependencies]
anylog = "0.6.3"
anyhow = { version = "1.0.69", features = ["backtrace"] }
apple-catalog-parsing = { path = "apple-catalog-parsing", optional = true }
backoff = "0.4.0"
brotli2 = "0.3.2"
bytecount = "0.6.3"
Expand Down Expand Up @@ -94,10 +93,6 @@ default = []
managed = []
with_crash_reporting = []

# Feature flag for the mobile-app command, as it is still under development.
# CI tests run against this flag, but we don't include it in release builds.
unstable-mobile-app = ["apple-catalog-parsing"]

[workspace.lints.clippy]
allow-attributes = "warn"
str-to-string = "warn"
Expand All @@ -114,6 +109,9 @@ workspace = true

[target."cfg(target_os = \"macos\")"]

[target."cfg(all(target_os = \"macos\", target_arch = \"aarch64\"))".dependencies]
apple-catalog-parsing = { path = "apple-catalog-parsing" }

[target."cfg(target_os = \"macos\")".dependencies]
mac-process-info = "0.2.0"

Expand Down
1 change: 0 additions & 1 deletion src/api/data_types/chunking/mobile_app.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]
use serde::{Deserialize, Serialize};
use sha1_smol::Digest;

Expand Down
1 change: 0 additions & 1 deletion src/api/data_types/chunking/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ pub use self::compression::ChunkCompression;
pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest};
pub use self::file_state::ChunkedFileState;
pub use self::hash_algorithm::ChunkHashAlgorithm;
#[cfg(feature = "unstable-mobile-app")]
pub use self::mobile_app::{AssembleMobileAppResponse, ChunkedMobileAppRequest};
pub use self::upload::{ChunkServerOptions, ChunkUploadCapability};
2 changes: 0 additions & 2 deletions src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,6 @@ impl<'a> AuthenticatedApi<'a> {
.convert_rnf(ApiErrorKind::ReleaseNotFound)
}

#[cfg(feature = "unstable-mobile-app")]
pub fn assemble_mobile_app(
&self,
org: &str,
Expand Down Expand Up @@ -2527,7 +2526,6 @@ struct LogsResponse {
}

/// VCS information for mobile app uploads
#[cfg(feature = "unstable-mobile-app")]
#[derive(Debug)]
pub struct VcsInfo<'a> {
pub head_sha: Option<&'a str>,
Expand Down
2 changes: 0 additions & 2 deletions src/commands/mobile_app/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]

use anyhow::Result;
use clap::{ArgMatches, Command};

Expand Down
1 change: 0 additions & 1 deletion src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ macro_rules! each_subcommand {
$mac!(issues);
$mac!(login);
$mac!(logs);
#[cfg(feature = "unstable-mobile-app")]
$mac!(mobile_app);
$mac!(monitors);
$mac!(organizations);
Expand Down
2 changes: 0 additions & 2 deletions src/utils/mobile_app/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]

#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
mod apple;
mod normalize;
Expand Down
2 changes: 0 additions & 2 deletions src/utils/vcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,11 @@ pub fn get_repo_from_remote(repo: &str) -> String {
obj.id
}

#[cfg(feature = "unstable-mobile-app")]
pub fn get_provider_from_remote(remote: &str) -> String {
let obj = VcsUrl::parse(remote);
obj.provider
}

#[cfg(feature = "unstable-mobile-app")]
pub fn git_repo_remote_url(
repo: &git2::Repository,
cached_remote: &str,
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/mobile_app/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "unstable-mobile-app")]

use crate::integration::TestManager;

mod upload;
Expand Down
Loading