From 0e52f6f4d3715e0895bc5b0c574495ba0b74576b Mon Sep 17 00:00:00 2001 From: Anton Yemelyanov Date: Tue, 9 Jan 2024 06:22:28 +0200 Subject: [PATCH] wip - CI --- .github/workflows/ci.yaml | 25 ++++++++++++++++----- core/src/egui/composite_button.rs | 2 +- core/src/egui/easy_mark/easy_mark_parser.rs | 8 ------- core/src/modules/block_dag.rs | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 56020aa..ef8c7ed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -299,7 +299,8 @@ jobs: matrix: # Build gnu-linux on ubuntu-18.04 and musl on ubuntu latest # os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ] - os: [ ubuntu-latest, windows-latest, macos-latest ] + os: [ ubuntu-latest ] + # os: [ ubuntu-latest, windows-latest, macos-latest ] # os: [ windows-latest, macos-latest ] name: Building, ${{ matrix.os }} steps: @@ -307,10 +308,17 @@ jobs: if: runner.os == 'Windows' run: git config --global core.autocrlf false - - name: Install desktop dependencies - if: runner.os == 'Linux' - run: | - sudo apt install -y libglib2.0-dev libatk1.0-dev libgtk-3-dev librust-atk-dev + # - name: Install desktop dependencies + # if: runner.os == 'Linux' + # run: | + # sudo apt install -y libglib2.0-dev libatk1.0-dev libgtk-3-dev librust-atk-dev musl-tools + + - name: Install apt prerequisites + if: ${{ runner.os == 'Linux' }} + uses: awalsh128/cache-apt-pkgs-action@v1 + with: + packages: musl-tools libglib2.0-dev libatk1.0-dev libgtk-3-dev librust-atk-dev + version: 1.0 - name: Checkout sources uses: actions/checkout@v3 @@ -338,6 +346,11 @@ jobs: if: runner.os == 'Linux' uses: goto-bus-stop/setup-zig@v2 # needed for cargo-zigbuild + - name: Install zig on linux + if: runner.os == 'Linux' + run: | + rustup target add x86_64-unknown-linux-musl + - name: Build on Linux if: runner.os == 'Linux' # We're using musl to make the binaries statically linked and portable @@ -345,7 +358,7 @@ jobs: # cargo install cargo-zigbuild # cargo --verbose zigbuild --bin kaspa-ng --release --target x86_64-unknown-linux-gnu.2.27 # Use an older glibc version run: | - cargo build --bin kaspa-ng --release + cargo build --bin kaspa-ng --release --target x86_64-unknown-linux-musl - name: Build on Windows if: runner.os == 'Windows' diff --git a/core/src/egui/composite_button.rs b/core/src/egui/composite_button.rs index ae37634..78bb935 100644 --- a/core/src/egui/composite_button.rs +++ b/core/src/egui/composite_button.rs @@ -21,7 +21,7 @@ impl<'a> Composite<'a> { /// /// See also [`Ui::button`]. /// -/// ``` +/// ```ignore /// # egui::__run_test_ui(|ui| { /// # fn do_stuff() {} /// diff --git a/core/src/egui/easy_mark/easy_mark_parser.rs b/core/src/egui/easy_mark/easy_mark_parser.rs index 75d8135..4989a6f 100644 --- a/core/src/egui/easy_mark/easy_mark_parser.rs +++ b/core/src/egui/easy_mark/easy_mark_parser.rs @@ -71,14 +71,6 @@ pub struct Style { /// Parser for the `EasyMark` markup language. /// /// See the module-level documentation for details. -/// -/// # Example: -/// ``` -/// # use egui_demo_lib::easy_mark::parser::Parser; -/// for item in Parser::new("Hello *world*!") { -/// } -/// -/// ``` pub struct Parser<'a> { /// The remainder of the input text s: &'a str, diff --git a/core/src/modules/block_dag.rs b/core/src/modules/block_dag.rs index f13cb3f..7646e8e 100644 --- a/core/src/modules/block_dag.rs +++ b/core/src/modules/block_dag.rs @@ -78,7 +78,7 @@ impl BlockDag { block_scale : 1.0, last_repaint : Instant::now(), parent_levels : 1, - parent_threshold : 25, + parent_threshold : 200, settings: BlockDagGraphSettings::default(), background : Arc::new(AtomicBool::new(false)), }