public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/channel_versions/src/bin/apply_overrides.rs
+2 -1
View File
@@ -1,4 +1,5 @@
use std::{fs, path::PathBuf};
use std::fs;
use std::path::PathBuf;
use anyhow::Result;
use channel_versions::{overrides, ChannelVersion, ChannelVersions};
crates/channel_versions/src/lib.rs
+1 -2
View File
@@ -7,11 +7,10 @@ use anyhow::{Context, Result};
use chrono::{DateTime, FixedOffset, NaiveDateTime};
use lazy_static::lazy_static;
use memo_map::MemoMap;
use overrides::*;
use regex::Regex;
use serde::{Deserialize, Serialize};
use overrides::*;
#[derive(Serialize, Deserialize, Debug)]
pub struct ChannelVersions {
pub dev: ChannelVersion,
crates/channel_versions/src/overrides.rs
+1 -1
View File
@@ -49,7 +49,7 @@ impl TargetOS {
Some(TargetOS::Web)
} else if cfg!(target_os = "macos") {
Some(TargetOS::MacOS)
} else if cfg!(target_os = "linux") {
} else if cfg!(any(target_os = "linux", target_os = "freebsd")) {
Some(TargetOS::Linux)
} else if cfg!(target_os = "windows") {
Some(TargetOS::Windows)
crates/channel_versions/src/overrides_tests.rs
+4 -5
View File
@@ -1,14 +1,13 @@
use chrono::{DateTime, Utc};
use crate::{ChannelVersion, ChannelVersions};
use super::*;
use crate::{ChannelVersion, ChannelVersions};
#[test]
fn test_only_first_override_is_applied() {
#[cfg(target_os = "macos")]
let predicate = OverridePredicate::TargetOS(TargetOS::MacOS);
#[cfg(target_os = "linux")]
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
let predicate = OverridePredicate::TargetOS(TargetOS::Linux);
#[cfg(target_os = "windows")]
let predicate = OverridePredicate::TargetOS(TargetOS::Windows);
@@ -130,7 +129,7 @@ fn test_unknown_target_is_ignored() {
fn test_cli_version_override_is_applied() {
#[cfg(target_os = "macos")]
let predicate = OverridePredicate::TargetOS(TargetOS::MacOS);
#[cfg(target_os = "linux")]
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
let predicate = OverridePredicate::TargetOS(TargetOS::Linux);
#[cfg(target_os = "windows")]
let predicate = OverridePredicate::TargetOS(TargetOS::Windows);
@@ -174,7 +173,7 @@ fn test_cli_version_override_is_applied() {
fn test_cli_version_preserved_when_override_omits_it() {
#[cfg(target_os = "macos")]
let predicate = OverridePredicate::TargetOS(TargetOS::MacOS);
#[cfg(target_os = "linux")]
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
let predicate = OverridePredicate::TargetOS(TargetOS::Linux);
#[cfg(target_os = "windows")]
let predicate = OverridePredicate::TargetOS(TargetOS::Windows);