#829 Build new ARM versions with latest Ubuntu again

Reason: glib too old ``` Warning: `PKG_CONFIG_ALLOW_SYSTEM_CFLAGS="1" PKG_CONFIG_PATH="/usr/lib/arm-linux-gnueabihf/pkgconfig/:" "pkg-config" "--libs" "--cflags" "glib-2.0" "glib-2.0 >= 2.56"` did not exit successfully: exit status: 1 ```
helgoboss · Apr 30, 2023 · 6ae83bb · 6ae83bb
1 parent 4da1926
commit 6ae83bb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -9,7 +9,9 @@ rustflags = ["-Ctarget-feature=+crt-static"]
 [target.x86_64-pc-windows-msvc]
 rustflags = ["-Ctarget-feature=+crt-static"]
 
+# This was an attempt to be compatible with older Linux versions (older libc).
 # Doesn't work for now because of: https://github.com/rust-lang/rust/issues/78210
+# Also see https://github.com/helgoboss/realearn/issues/829 for latest ideas.
 # TODO-medium Try again later. Not urgent.
 #[target.aarch64-unknown-linux-gnu]
 #rustflags = ["-Ctarget-feature=+crt-static"]

diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -15,7 +15,7 @@ name: Linux aarch64
 jobs:
   check:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/linux-armv7.yml b/.github/workflows/linux-armv7.yml
@@ -15,7 +15,7 @@ name: Linux armv7
 jobs:
   check:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,15 +50,15 @@ jobs:
             strip-cmd: strip
             profile: release
           - artifact: linux-aarch64
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             toolchain-suffix: x86_64-unknown-linux-gnu
             lib-file-name: librealearn.so
             target: aarch64-unknown-linux-gnu
             use-cross: true
             strip-cmd: aarch64-linux-gnu-strip
             profile: release
           - artifact: linux-armv7
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             toolchain-suffix: x86_64-unknown-linux-gnu
             lib-file-name: librealearn.so
             target: armv7-unknown-linux-gnueabihf
@@ -83,7 +83,7 @@ jobs:
       - run: rustup component add rustfmt
       # Install OS dependencies (Linux/macOS only)
       - name: Install native Linux dependencies
-        if: matrix.os == 'ubuntu-20.04'
+        if: startsWith(matrix.os, 'ubuntu-')
         run: |
           sudo apt-get update
           sudo apt-get install nasm php binutils-arm-linux-gnueabihf binutils-aarch64-linux-gnu libxdo-dev libx11-dev libxcursor-dev libxcb-dri2-0-dev libxcb-icccm4-dev libx11-xcb-dev mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev libspeechd-dev libgtk-3-dev
@@ -112,7 +112,7 @@ jobs:
       # Strip debug symbols (Linux and macOS)
       # TODO-medium We could replace this with Cargo's recent built-in strip function
       - name: Strip debug symbols from Linux binary
-        if: matrix.os == 'ubuntu-20.04'
+        if: startsWith(matrix.os, 'ubuntu-')
         run: |
           cp target/${{ matrix.target }}/${{ matrix.profile }}/${{ matrix.lib-file-name }} target/${{ matrix.target }}/${{ matrix.profile }}/librealearn-debug.so
           ${{ matrix.strip-cmd }} target/${{ matrix.target }}/${{ matrix.profile }}/${{ matrix.lib-file-name }}
@@ -140,7 +140,7 @@ jobs:
           name: ${{ matrix.artifact }}
           path: target/${{ matrix.target }}/${{ matrix.profile }}/deps/librealearn.dylib.dSYM/
       - name: Upload Linux debug symbols to artifact
-        if: matrix.os == 'ubuntu-20.04'
+        if: startsWith(matrix.os, 'ubuntu-')
         uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.artifact }}
@@ -149,7 +149,7 @@ jobs:
   create-release:
     name: Publish release
     needs: build-release-artifacts
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Get tag name
         id: get_tag_name

diff --git a/main/src/infrastructure/ui/egui_views/pot_browser_panel.rs b/main/src/infrastructure/ui/egui_views/pot_browser_panel.rs
@@ -8,7 +8,7 @@ use crate::domain::pot::{FilterItemId, PresetId};
 use crate::domain::BackboneState;
 use egui::{
     popup_below_widget, vec2, Align, Button, CentralPanel, Color32, DragValue, Event, Frame, Key,
-    Layout, RichText, ScrollArea, TextEdit, TextStyle, TopBottomPanel, Ui, Widget,
+    Layout, RichText, ScrollArea, TextEdit, TextStyle, TopBottomPanel, Ui, Visuals, Widget,
 };
 use egui::{Context, SidePanel};
 use egui_extras::{Column, TableBuilder};
@@ -219,6 +219,15 @@ pub fn run_ui(ctx: &Context, state: &mut State) {
                             .clicked() {
                             pot_unit.refresh_pot(state.pot_unit.clone());
                         }
+                        if ui.button(RichText::new("🌙").size(TOOLBAR_SIZE)).clicked() {
+                            let style = ui.style_mut();
+                            let new_visuals = if style.visuals.dark_mode {
+                                Visuals::light()
+                            }  else {
+                                Visuals::dark()
+                            };
+                            style.visuals = new_visuals;
+                        }
                         let help_button = ui.button(RichText::new("❓").size(TOOLBAR_SIZE));
                         let help_id = ui.make_persistent_id("help");
                         if help_button.clicked() {