mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-09-02 09:09:17 +00:00
Merge branch 'main' into feat/dns-policy
# Conflicts: # easytier/Cargo.toml
This commit is contained in:
@@ -6,12 +6,14 @@ on:
|
|||||||
paths:
|
paths:
|
||||||
- "**/*.nix"
|
- "**/*.nix"
|
||||||
- "flake.lock"
|
- "flake.lock"
|
||||||
|
- "rust-toolchain.toml"
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: ["main", "develop"]
|
branches: ["main", "develop"]
|
||||||
types: [opened, synchronize, reopened, ready_for_review]
|
types: [opened, synchronize, reopened, ready_for_review]
|
||||||
paths:
|
paths:
|
||||||
- "**/*.nix"
|
- "**/*.nix"
|
||||||
- "flake.lock"
|
- "flake.lock"
|
||||||
|
- "rust-toolchain.toml"
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||||
@@ -32,5 +34,11 @@ jobs:
|
|||||||
- name: Magic Nix Cache
|
- name: Magic Nix Cache
|
||||||
uses: DeterminateSystems/magic-nix-cache-action@v6
|
uses: DeterminateSystems/magic-nix-cache-action@v6
|
||||||
|
|
||||||
- name: Check full devShell
|
- name: Warm up full devShell
|
||||||
run: nix develop .#full --command true
|
run: nix develop .#full --command true
|
||||||
|
|
||||||
|
- name: Cargo check in flake environment
|
||||||
|
run: nix develop .#full --command cargo check
|
||||||
|
|
||||||
|
- name: Cargo build in flake environment
|
||||||
|
run: nix develop .#full --command cargo build
|
||||||
|
|||||||
+1
-2
@@ -166,8 +166,7 @@ network-interface = "2.0"
|
|||||||
|
|
||||||
# for ospf route
|
# for ospf route
|
||||||
petgraph = "0.8.1"
|
petgraph = "0.8.1"
|
||||||
hashbrown = "0.15.3"
|
ordered_hash_map = "0.5.0"
|
||||||
ordered_hash_map = "0.5.0"# TODO: REPLACE THIS
|
|
||||||
indexmap = "2.13.1"
|
indexmap = "2.13.1"
|
||||||
|
|
||||||
moka = { version = "0.12.13", features = ["future"] }
|
moka = { version = "0.12.13", features = ["future"] }
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
use core::cmp::Ordering;
|
use core::cmp::Ordering;
|
||||||
use hashbrown::hash_map::{
|
|
||||||
Entry::{Occupied, Vacant},
|
|
||||||
HashMap,
|
|
||||||
};
|
|
||||||
use petgraph::{
|
use petgraph::{
|
||||||
algo::Measure,
|
algo::Measure,
|
||||||
visit::{EdgeRef as _, IntoEdges, VisitMap as _, Visitable},
|
visit::{EdgeRef, IntoEdges, VisitMap, Visitable},
|
||||||
};
|
};
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::collections::hash_map::Entry::{Occupied, Vacant};
|
||||||
use std::{collections::BinaryHeap, hash::Hash};
|
use std::{collections::BinaryHeap, hash::Hash};
|
||||||
|
|
||||||
/// `MinScored<K, T>` holds a score `K` and a scored object `T` in
|
/// `MinScored<K, T>` holds a score `K` and a scored object `T` in
|
||||||
|
|||||||
@@ -67,6 +67,7 @@
|
|||||||
rust
|
rust
|
||||||
protobuf
|
protobuf
|
||||||
clang
|
clang
|
||||||
|
mold
|
||||||
pkg-config
|
pkg-config
|
||||||
bridge-utils # for three node test
|
bridge-utils # for three node test
|
||||||
]
|
]
|
||||||
@@ -98,6 +99,10 @@
|
|||||||
KCP_SYS_EXTRA_HEADER_PATH = "${pkgs.libclang.lib}/lib/clang/19/include:${pkgs.glibc.dev}/include";
|
KCP_SYS_EXTRA_HEADER_PATH = "${pkgs.libclang.lib}/lib/clang/19/include:${pkgs.glibc.dev}/include";
|
||||||
JEMALLOC_OVERRIDE = "${pkgs.jemalloc}/lib/libjemalloc.so";
|
JEMALLOC_OVERRIDE = "${pkgs.jemalloc}/lib/libjemalloc.so";
|
||||||
}
|
}
|
||||||
|
// pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||||
|
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER = "clang";
|
||||||
|
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "clang";
|
||||||
|
}
|
||||||
// (if hasFeature "android" then android.envVars else { }));
|
// (if hasFeature "android" then android.envVars else { }));
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user