Merge pull request #149 from zonble/master

Adds more images to run CI jobs.
openvanilla · Aug 2, 2024 · 8cbefdc · 8cbefdc
2 parents b3581b5 + beb254d
commit 8cbefdc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3,10 +3,19 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build_ubuntu:
+  build_debian_based:
     strategy:
+      fail-fast: false
       matrix:
-        os: ["ubuntu:22.04", "ubuntu:24.04"]
+        os:
+          [
+            "ubuntu:22.04",
+            "ubuntu:24.04",
+            "ubuntu:24.10",
+            "debian:12",
+            "linuxmintd/mint22-amd64",
+            "linuxmintd/mint21-amd64",
+          ]
     runs-on: ubuntu-latest
     container: ${{ matrix.os }}
     steps:
@@ -20,6 +29,10 @@ jobs:
           apt install -y cmake extra-cmake-modules gettext libfmt-dev
           apt install -y fcitx5 libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev fcitx5-modules-dev
           apt install -y libjson-c-dev
+      - name: Install Build Essential
+        if: matrix.os == 'ubuntu:24.10'
+        run: |
+          apt install -y build-essential
       - name: Build
         run: |
           mkdir -p build
@@ -36,10 +49,13 @@ jobs:
           cd build
           ctest --output-on-failure
 
-  build_ubuntu_20:
+  build_debian_based_legacy:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu:20.04", "linuxmintd/mint20-amd64"]
     runs-on: ubuntu-latest
-    container: ubuntu:20.04
-
+    container: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies

diff --git a/src/Engine/gramambular2/reading_grid_test.cpp b/src/Engine/gramambular2/reading_grid_test.cpp
@@ -23,6 +23,7 @@
 
 #include "reading_grid.h"
 
+#include <algorithm>
 #include <iostream>
 #include <map>
 #include <string>
@@ -742,8 +743,8 @@ TEST(ReadingGridTest, DisambiguateCandidates) {
   ASSERT_EQ(result.valuesAsStrings(),
             (std::vector<std::string>{"高熱", "🔥", "焰", "危險"}));
 
-  ASSERT_TRUE(
-      grid.overrideCandidate(loc, ReadingGrid::Candidate("ㄏㄨㄛˇㄧㄢˋ", "🔥")));
+  ASSERT_TRUE(grid.overrideCandidate(
+      loc, ReadingGrid::Candidate("ㄏㄨㄛˇㄧㄢˋ", "🔥")));
   result = grid.walk();
   ASSERT_EQ(result.valuesAsStrings(),
             (std::vector<std::string>{"高熱", "🔥", "危險"}));