More extensive CI tests

Signed-off-by: falkTX <[email protected]>
DISTRHO · Oct 6, 2024 · 9b0aea2 · 9b0aea2
1 parent 1662e56
commit 9b0aea2
Show file tree

Hide file tree

Showing 3 changed files with 104 additions and 117 deletions.
diff --git a/.github/workflows/makefile.yml → .github/workflows/build.yml b/.github/workflows/makefile.yml → .github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: makefile
+name: build
 
 on:
   push:
@@ -7,17 +7,28 @@ on:
   pull_request:
     branches:
       - '*'
-env:
-  DEBIAN_FRONTEND: noninteractive
 
 jobs:
-  linux-x86_64:
-    runs-on: ubuntu-22.04
+  build:
+    strategy:
+      matrix:
+        os:
+          - macos-12
+          - macos-13
+          - macos-14
+          # webgui failure
+          # - ubuntu-20.04
+          - ubuntu-22.04
+          - ubuntu-24.04
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Set up dependencies
+      if: ${{ runner.os == 'Linux' }}
+      env:
+        DEBIAN_FRONTEND: noninteractive
       run: |
         sudo apt-get update -qq
         sudo apt-get install -yq libasound2-dev libcairo2-dev libdbus-1-dev libgl1-mesa-dev liblo-dev libpulse-dev libsdl2-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev xvfb
@@ -27,7 +38,7 @@ jobs:
         CXXFLAGS: -Werror
       run: |
         make clean >/dev/null
-        make -j $(nproc)
+        make
     - name: Run tests
       env:
         CFLAGS: -Werror
@@ -40,39 +51,67 @@ jobs:
         CXXFLAGS: -Werror -std=gnu++98
       run: |
         make clean >/dev/null
-        make -j $(nproc)
+        make
+    - name: As C++11 mode
+      env:
+        CFLAGS: -Werror
+        CXXFLAGS: -Werror -std=gnu++11
+      run: |
+        make clean >/dev/null
+        make
+    - name: As C++14 mode
+      env:
+        CFLAGS: -Werror
+        CXXFLAGS: -Werror -std=gnu++14
+      run: |
+        make clean >/dev/null
+        make
+    - name: As C++17 mode
+      env:
+        CFLAGS: -Werror
+        CXXFLAGS: -Werror -std=gnu++17
+      run: |
+        make clean >/dev/null
+        make
+    - name: As C++20 mode
+      env:
+        CFLAGS: -Werror
+        CXXFLAGS: -Werror -std=gnu++20
+      run: |
+        make clean >/dev/null
+        make
     - name: No namespace
       env:
         CFLAGS: -Werror
         CXXFLAGS: -Werror -DDONT_SET_USING_DISTRHO_NAMESPACE -DDONT_SET_USING_DGL_NAMESPACE
       run: |
         make clean >/dev/null
-        make -j $(nproc)
+        make
     - name: Custom namespace
       env:
         CFLAGS: -Werror
         CXXFLAGS: -Werror -DDISTRHO_NAMESPACE=WubbWubb -DDGL_NAMESPACE=DabDab
       run: |
         make clean >/dev/null
-        make -j $(nproc)
+        make
     - name: With OpenGL 3.x
       env:
         CFLAGS: -Werror
         CXXFLAGS: -Werror
       run: |
         make clean >/dev/null
-        make -j $(nproc) USE_OPENGL3=true
+        make USE_OPENGL3=true
     - name: Without Cairo
       env:
         CFLAGS: -Werror
         CXXFLAGS: -Werror
       run: |
         make clean >/dev/null
-        make -j $(nproc) HAVE_CAIRO=
+        make HAVE_CAIRO=false
     - name: Without OpenGL
       env:
         CFLAGS: -Werror
         CXXFLAGS: -Werror
       run: |
         make clean >/dev/null
-        make -j $(nproc) HAVE_OPENGL=
+        make HAVE_OPENGL=false
diff --git a/distrho/extra/Base64.hpp b/distrho/extra/Base64.hpp
@@ -21,7 +21,7 @@
 
 #include <vector>
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // base64 stuff, based on http://www.adp-gmbh.ch/cpp/common/base64.html
 
 /*
@@ -48,7 +48,7 @@
    René Nyffenegger [email protected]
 */
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 // Helpers
 
 #ifndef DOXYGEN
@@ -77,82 +77,13 @@ uint8_t findBase64CharIndex(const char c)
 static constexpr inline
 bool isBase64Char(const char c)
 {
-    switch (c)
-    {
-    case 'A':
-    case 'B':
-    case 'C':
-    case 'D':
-    case 'E':
-    case 'F':
-    case 'G':
-    case 'H':
-    case 'I':
-    case 'J':
-    case 'K':
-    case 'L':
-    case 'M':
-    case 'N':
-    case 'O':
-    case 'P':
-    case 'Q':
-    case 'R':
-    case 'S':
-    case 'T':
-    case 'U':
-    case 'V':
-    case 'W':
-    case 'X':
-    case 'Y':
-    case 'Z':
-    case 'a':
-    case 'b':
-    case 'c':
-    case 'd':
-    case 'e':
-    case 'f':
-    case 'g':
-    case 'h':
-    case 'i':
-    case 'j':
-    case 'k':
-    case 'l':
-    case 'm':
-    case 'n':
-    case 'o':
-    case 'p':
-    case 'q':
-    case 'r':
-    case 's':
-    case 't':
-    case 'u':
-    case 'v':
-    case 'w':
-    case 'x':
-    case 'y':
-    case 'z':
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-    case '+':
-    case '/':
-        return true;
-    default:
-        return false;
-    }
+    return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '+' || c == '/';
 }
 
 } // namespace DistrhoBase64Helpers
 #endif
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 
 static inline
 std::vector<uint8_t> d_getChunkFromBase64String(const char* const base64string)
@@ -213,6 +144,6 @@ std::vector<uint8_t> d_getChunkFromBase64String(const char* const base64string)
     return ret;
 }
 
-// -----------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------------------------
 
 #endif // DISTRHO_BASE64_HPP_INCLUDED