Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
9 changes: 8 additions & 1 deletion .github/actions/bundle_arch_package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ inputs:
description: The artifact type to build (app or cli)
required: false
default: app
settings-schema-source:
description: The path to the settings schema to package.
required: true

runs:
using: composite
Expand All @@ -27,16 +30,20 @@ runs:

- name: Run in container
shell: bash
env:
SETTINGS_SCHEMA_SOURCE: ${{ inputs.settings-schema-source }}
run: |
settings_schema_source="$(realpath "$SETTINGS_SCHEMA_SOURCE")"
docker run --rm \
-v "${{ github.workspace }}:/github/workspace" \
-v "${{ github.workspace }}/target:/github/workspace/target" \
-v "$settings_schema_source:/tmp/settings_schema.json:ro" \
-w /github/workspace \
-v "${CARGO_HOME:-$HOME/.cargo}/git:/home/build/.cargo/git" \
-v "${CARGO_HOME:-$HOME/.cargo}/registry:/home/build/.cargo/registry" \
-e GIT_RELEASE_TAG="$GIT_RELEASE_TAG" \
-e GITHUB_ACTIONS="$GITHUB_ACTIONS" \
-e GITHUB_OUTPUT="/dev/null" \
${SETTINGS_SCHEMA_CACHE:+-e SETTINGS_SCHEMA_CACHE=/github/workspace/.settings_schema_cache.json} \
-e SETTINGS_SCHEMA_SOURCE="/tmp/settings_schema.json" \
arch-bundle-builder \
${{ inputs.channel }} ${{ inputs.release-tag }} ${{ inputs.arch }} ${{ inputs.artifact }}
887 changes: 741 additions & 146 deletions .github/workflows/create_release.yml

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ path = "src/bin/preview.rs"
required-features = ["preview_channel"]
test = false

[[bin]]
name = "generate_settings_schema"
path = "src/bin/generate_settings_schema.rs"
test = false

[dependencies]
addr = "0.15.6"
ai.workspace = true
Expand Down
284 changes: 0 additions & 284 deletions app/src/bin/generate_settings_schema.rs

This file was deleted.

32 changes: 0 additions & 32 deletions app/src/bin/generate_settings_schema_tests.rs

This file was deleted.

4 changes: 4 additions & 0 deletions app/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,10 @@ pub fn run() -> Result<()> {
return debug_dump::run();
}
#[cfg(not(target_family = "wasm"))]
warp_cli::Command::DumpSettingsSchema { output_path } => {
return settings::schema_generation::dump_settings_schema(output_path.as_deref());
}
#[cfg(not(target_family = "wasm"))]
warp_cli::Command::PrintTelemetryEvents => {
return TelemetryEvent::print_telemetry_events_json();
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/settings/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ mod onboarding;
mod pane;
mod privacy;
mod same_line_prompt_block;
#[cfg(not(target_family = "wasm"))]
pub(crate) mod schema_generation;
mod scroll;
mod select;
mod shared_object_limit_banner;
Expand Down Expand Up @@ -66,6 +68,8 @@ pub use onboarding::*;
pub use pane::*;
pub use privacy::*;
pub use same_line_prompt_block::*;
#[cfg(not(target_family = "wasm"))]
pub use schema_generation::dump_settings_schema;
pub use scroll::*;
pub use select::*;
pub use shared_object_limit_banner::*;
Expand Down
Loading
Loading