Merge pull request #100 from baconpaul/workflow-on

Modify ci.yml 'on' to run on pull request; Add Linux

.github/workflows/ci.yml

@@ -3,6 +3,10 @@ name: CI
 on:
   workflow_dispatch:
   push:
+  pull_request:
+    branches:
+      - main
+      - next
 
 env:
   CMAKE_BUILD_PARALLEL_LEVEL: 3 # Use up to 3 cpus to build juceaide, etc
@@ -29,14 +33,23 @@ jobs:
       fail-fast: false
       matrix:
         app: [ member_enabled, member_disabled, unique_ptr_enabled, unique_ptr_disabled ]
-        os: [ macos-latest, windows-latest ]
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
 
+      - name: Install Linux Deps
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libglu1-mesa-dev libjack-jackd2-dev
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
+
+
       - name: Run sccache-cache
         uses: mozilla-actions/[email protected]
 

CMakeLists.txt

@@ -24,6 +24,12 @@ if (MelatoninInspector_IS_TOP_LEVEL)
 
     juce_add_gui_app ("${TARGET_NAME}" VERSION 1.0.0)
     target_sources("${TARGET_NAME}" PRIVATE "tests/${TARGET_NAME}.cpp")
+
+    target_compile_definitions("${TARGET_NAME}" PUBLIC
+        JUCE_USE_CURL=0
+        JUCE_WEB_BROWSER=0
+    )
+
     set_target_properties("${TARGET_NAME}" PROPERTIES COMPILE_WARNING_AS_ERROR ON)
 
 endif ()

melatonin/components/colour_property_component.h

@@ -46,9 +46,9 @@ namespace melatonin
         {
         public:
             explicit ColorSelector (int selectorFlags = (showAlphaChannel | showColourAtTop | showSliders | showColourspace),
-                int edgeGap = 4,
-                int gapAroundColourSpaceComponent = 7)
-                : juce::ColourSelector (selectorFlags, edgeGap, gapAroundColourSpaceComponent)
+                int _edgeGap = 4,
+                int _gapAroundColourSpaceComponent = 7)
+                : juce::ColourSelector (selectorFlags, _edgeGap, _gapAroundColourSpaceComponent)
             {
                 addChangeListener (this);
             }

melatonin_inspector.cpp

@@ -3,6 +3,8 @@
 // As recommended by the JUCE MODULE API, these cpp files are included by the main module cpp
 // See https://github.com/juce-framework/JUCE/blob/master/docs/JUCE%20Module%20Format.md#module-cpp-files
 
+#include <juce_core/juce_core.h>
+JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE("-Wredundant-decls")
 // NOLINTBEGIN(bugprone-suspicious-include)
 #include "LatestCompiledAssets/BinaryData1.cpp"
 #include "LatestCompiledAssets/BinaryData10.cpp"
@@ -23,4 +25,5 @@
 #include "LatestCompiledAssets/BinaryData8.cpp"
 #include "LatestCompiledAssets/BinaryData9.cpp"
 // NOLINTEND(bugprone-suspicious-include)
+JUCE_END_IGNORE_WARNINGS_GCC_LIKE