Skip to content

Commit 29151e5

Browse files
Revert "feat(mobile-app): Reintroduce mobile-app feature gating (#2643)" (#2670)
This reverts commit eccd48c. --------- Co-authored-by: Nelson Osacky <[email protected]>
1 parent e92bd06 commit 29151e5

File tree

13 files changed

+8
-35
lines changed

13 files changed

+8
-35
lines changed

.cursor/rules/cicd-patterns.mdc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,4 @@ When adding new CI checks:
5656
## Environment Variables in CI
5757

5858
- `RUSTFLAGS: -Dwarnings` enforced in CI
59-
- Feature flag testing: `-Funstable-mobile-app`
6059
- Cross-platform matrix: Ubuntu 24.04, macOS 14, Windows 2022

.github/workflows/lint.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- x86_64-pc-windows-msvc
2121
- aarch64-apple-darwin
2222
- x86_64-apple-darwin
23-
feature-args: ['', '-Funstable-mobile-app']
2423
include:
2524
- target: x86_64-unknown-linux-musl
2625
os: ubuntu-24.04
@@ -34,12 +33,8 @@ jobs:
3433
- target: x86_64-apple-darwin
3534
os: macos-14
3635
display-os: macOS – x86_64
37-
- feature-args: ''
38-
feature-suffix: ''
39-
- feature-args: '-Funstable-mobile-app'
40-
feature-suffix: ' (-Funstable-mobile-app)'
4136

42-
name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
37+
name: ${{ matrix.display-os }}
4338
runs-on: ${{ matrix.os }}
4439
steps:
4540
- name: Checkout Repository
@@ -64,4 +59,4 @@ jobs:
6459
run: cargo fmt --all -- --check
6560

6661
- name: Run Clippy
67-
run: cargo clippy --workspace --tests --target ${{ matrix.target }} ${{ matrix.feature-args }}
62+
run: cargo clippy --workspace --tests --target ${{ matrix.target }}

.github/workflows/test.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- x86_64-pc-windows-msvc
2121
- aarch64-apple-darwin
2222
- x86_64-apple-darwin
23-
feature-args: ['', '-Funstable-mobile-app']
2423
include:
2524
- target: x86_64-unknown-linux-musl
2625
os: ubuntu-24.04
@@ -34,12 +33,8 @@ jobs:
3433
- target: x86_64-apple-darwin
3534
os: macos-14
3635
display-os: macOS – x86_64
37-
- feature-args: ''
38-
feature-suffix: ''
39-
- feature-args: '-Funstable-mobile-app'
40-
feature-suffix: ' (-Funstable-mobile-app)'
4136

42-
name: ${{ matrix.display-os }}${{ matrix.feature-suffix }}
37+
name: ${{ matrix.display-os }}
4338
runs-on: ${{ matrix.os }}
4439

4540
steps:
@@ -59,4 +54,4 @@ jobs:
5954
uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
6055

6156
- name: Run Cargo Tests
62-
run: cargo test --workspace --target ${{ matrix.target }} ${{ matrix.feature-args }}
57+
run: cargo test --workspace --target ${{ matrix.target }}

.vscode/settings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"rust-analyzer.cargo.features": ["unstable-mobile-app"],
32
"rust-analyzer.cargo.noDefaultFeatures": false,
43
"rust-analyzer.check.command": "clippy"
5-
}
4+
}

Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ rust-version = "1.86"
1111
[dependencies]
1212
anylog = "0.6.3"
1313
anyhow = { version = "1.0.69", features = ["backtrace"] }
14-
apple-catalog-parsing = { path = "apple-catalog-parsing", optional = true }
1514
backoff = "0.4.0"
1615
brotli2 = "0.3.2"
1716
bytecount = "0.6.3"
@@ -94,10 +93,6 @@ default = []
9493
managed = []
9594
with_crash_reporting = []
9695

97-
# Feature flag for the mobile-app command, as it is still under development.
98-
# CI tests run against this flag, but we don't include it in release builds.
99-
unstable-mobile-app = ["apple-catalog-parsing"]
100-
10196
[workspace.lints.clippy]
10297
allow-attributes = "warn"
10398
str-to-string = "warn"
@@ -114,6 +109,9 @@ workspace = true
114109

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

112+
[target."cfg(all(target_os = \"macos\", target_arch = \"aarch64\"))".dependencies]
113+
apple-catalog-parsing = { path = "apple-catalog-parsing" }
114+
117115
[target."cfg(target_os = \"macos\")".dependencies]
118116
mac-process-info = "0.2.0"
119117

src/api/data_types/chunking/mobile_app.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![cfg(feature = "unstable-mobile-app")]
21
use serde::{Deserialize, Serialize};
32
use sha1_smol::Digest;
43

src/api/data_types/chunking/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ pub use self::compression::ChunkCompression;
1414
pub use self::dif::{AssembleDifsRequest, AssembleDifsResponse, ChunkedDifRequest};
1515
pub use self::file_state::ChunkedFileState;
1616
pub use self::hash_algorithm::ChunkHashAlgorithm;
17-
#[cfg(feature = "unstable-mobile-app")]
1817
pub use self::mobile_app::{AssembleMobileAppResponse, ChunkedMobileAppRequest};
1918
pub use self::upload::{ChunkServerOptions, ChunkUploadCapability};

src/api/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,6 @@ impl<'a> AuthenticatedApi<'a> {
10301030
.convert_rnf(ApiErrorKind::ReleaseNotFound)
10311031
}
10321032

1033-
#[cfg(feature = "unstable-mobile-app")]
10341033
pub fn assemble_mobile_app(
10351034
&self,
10361035
org: &str,
@@ -2527,7 +2526,6 @@ struct LogsResponse {
25272526
}
25282527

25292528
/// VCS information for mobile app uploads
2530-
#[cfg(feature = "unstable-mobile-app")]
25312529
#[derive(Debug)]
25322530
pub struct VcsInfo<'a> {
25332531
pub head_sha: Option<&'a str>,

src/commands/mobile_app/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![cfg(feature = "unstable-mobile-app")]
2-
31
use anyhow::Result;
42
use clap::{ArgMatches, Command};
53

src/commands/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ macro_rules! each_subcommand {
6060
$mac!(issues);
6161
$mac!(login);
6262
$mac!(logs);
63-
#[cfg(feature = "unstable-mobile-app")]
6463
$mac!(mobile_app);
6564
$mac!(monitors);
6665
$mac!(organizations);

0 commit comments

Comments
 (0)