wip - CI

aspectron · Jan 9, 2024 · 0e52f6f · 0e52f6f
1 parent d44c9bd
commit 0e52f6f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -299,18 +299,26 @@ 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:
       - name: Fix CRLF on Windows
         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,14 +346,19 @@ 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
         # run: |
         #   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
@@ -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
@@ -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
@@ -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)),
         }