From 459c194c570fac964b199072541f978f77f02d5c Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 19:32:52 -0700
Subject: [PATCH 1/8] Compile with user-supplied Makefile if provided and on
 Linux or macOS.

---
 .github/workflows/linux.yaml                  | 10 +++
 .github/workflows/macos.yaml                  | 11 +++
 .github/workflows/windows.yaml                | 12 +++
 SampleProjects/Makefile/.arduino-ci.yml       |  7 ++
 SampleProjects/Makefile/.gitignore            |  1 +
 SampleProjects/Makefile/Gemfile               |  2 +
 SampleProjects/Makefile/Makefile              | 61 ++++++++++++++
 SampleProjects/Makefile/README.md             |  4 +
 SampleProjects/Makefile/library.properties    | 10 +++
 SampleProjects/Makefile/src/SharedLibrary.cpp |  5 ++
 SampleProjects/Makefile/src/SharedLibrary.h   |  3 +
 SampleProjects/Makefile/test.sh               |  5 ++
 SampleProjects/Makefile/test/test.cpp         | 13 +++
 lib/arduino_ci/cpp_library.rb                 | 84 +++++++++++--------
 14 files changed, 191 insertions(+), 37 deletions(-)
 create mode 100644 SampleProjects/Makefile/.arduino-ci.yml
 create mode 100644 SampleProjects/Makefile/.gitignore
 create mode 100644 SampleProjects/Makefile/Gemfile
 create mode 100644 SampleProjects/Makefile/Makefile
 create mode 100644 SampleProjects/Makefile/README.md
 create mode 100644 SampleProjects/Makefile/library.properties
 create mode 100644 SampleProjects/Makefile/src/SharedLibrary.cpp
 create mode 100644 SampleProjects/Makefile/src/SharedLibrary.h
 create mode 100755 SampleProjects/Makefile/test.sh
 create mode 100644 SampleProjects/Makefile/test/test.cpp

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index 5d4876b2..ff962c28 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -87,3 +87,13 @@ jobs:
           ruby-version: 2.6
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
+
+  Makefile:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Check usage - Demo Makefile
+        run: ./SampleProjects/Makefile/test.sh
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index 857f547b..14006c29 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -72,3 +72,14 @@ jobs:
           ruby-version: 2.6
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
+
+  Makefile:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Check usage - Demo Makefile
+        run: ./SampleProjects/Makefile/test.sh
+            
\ No newline at end of file
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index a67dbda0..eda0a1a8 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -72,3 +72,15 @@ jobs:
           ruby-version: 2.6
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
+
+
+  Makefile:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+      - name: Check usage - Demo Makefile
+        run: ./SampleProjects/Makefile/test.sh
+      
\ No newline at end of file
diff --git a/SampleProjects/Makefile/.arduino-ci.yml b/SampleProjects/Makefile/.arduino-ci.yml
new file mode 100644
index 00000000..f63d2413
--- /dev/null
+++ b/SampleProjects/Makefile/.arduino-ci.yml
@@ -0,0 +1,7 @@
+unittest:
+  platforms:
+    - mega2560
+
+compile:
+  platforms:
+    - mega2560
diff --git a/SampleProjects/Makefile/.gitignore b/SampleProjects/Makefile/.gitignore
new file mode 100644
index 00000000..677c4659
--- /dev/null
+++ b/SampleProjects/Makefile/.gitignore
@@ -0,0 +1 @@
+.bundle
diff --git a/SampleProjects/Makefile/Gemfile b/SampleProjects/Makefile/Gemfile
new file mode 100644
index 00000000..b2b3b1fd
--- /dev/null
+++ b/SampleProjects/Makefile/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'arduino_ci', path: '../../'
diff --git a/SampleProjects/Makefile/Makefile b/SampleProjects/Makefile/Makefile
new file mode 100644
index 00000000..302a5d00
--- /dev/null
+++ b/SampleProjects/Makefile/Makefile
@@ -0,0 +1,61 @@
+# ARDUINO_CI should point to cpp/ and be provided as a shell environment variable
+LIBRARIES := $(shell bundle exec arduino_library_location.rb)
+SRC=$(LIBRARIES)/Makefile/src
+TEST=$(LIBRARIES)/Makefile/test
+BIN=$(LIBRARIES)/Makefile/.arduino_ci
+
+FLAGS=-std=c++0x \
+	-Wno-deprecated-declarations \
+  -DARDUINO=100 \
+  -g \
+  -O1 \
+  -fno-omit-frame-pointer \
+  -fno-optimize-sibling-calls \
+  -fsanitize=address \
+  -Wno-unknown-attributes \
+  -Wno-address-of-packed-member \
+  -D__AVR__ \
+  -D__AVR_ATmega2560__ \
+  -DARDUINO_ARCH_AVR \
+  -DARDUINO_AVR_MEGA2560
+
+INCLUDE=-I$(ARDUINO_CI)/arduino \
+  -I$(ARDUINO_CI)/unittest \
+  -I$(LIBRARIES)/Makefile/src \
+
+GPP_TEST=g++ $(FLAGS) -L$(BIN) $(INCLUDE)
+
+.PHONY : all
+all : $(BIN)/test.cpp.bin
+
+
+$(BIN)/test.cpp.bin: $(BIN)/libarduino.so $(TEST)/test.cpp
+	echo "building test.cpp.bin"
+	$(GPP_TEST) -o $(BIN)/test.cpp.bin $(TEST)/test.cpp -larduino
+
+OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTests.o \
+	$(BIN)/SharedLibrary.o 
+
+$(BIN)/libarduino.so: $(OBJECTS)
+	g++ $(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup -L$(BIN) $(INCLUDE) \
+	-o $(BIN)/libarduino.so $(OBJECTS)
+
+$(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp
+
+$(BIN)/Godmode.o: $(ARDUINO_CI)/arduino/Godmode.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Godmode.o $(ARDUINO_CI)/arduino/Godmode.cpp
+
+$(BIN)/stdlib.o: $(ARDUINO_CI)/arduino/stdlib.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/stdlib.o $(ARDUINO_CI)/arduino/stdlib.cpp
+
+$(BIN)/ArduinoUnitTests.o: $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ArduinoUnitTests.o $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp
+
+$(BIN)/SharedLibrary.o: $(SRC)/SharedLibrary.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/SharedLibrary.o $(SRC)/SharedLibrary.cpp
+
+
+.PHONY: clean
+clean:
+	rm -rf $(BIN)/*
diff --git a/SampleProjects/Makefile/README.md b/SampleProjects/Makefile/README.md
new file mode 100644
index 00000000..c7012de3
--- /dev/null
+++ b/SampleProjects/Makefile/README.md
@@ -0,0 +1,4 @@
+# Makefile
+
+This sample project shows that you can create your own Makefile and bypass the (much slower!) Arduino CI process.
+Of course, you are then responsible for managing the list of files and prerequisites yourself!
diff --git a/SampleProjects/Makefile/library.properties b/SampleProjects/Makefile/library.properties
new file mode 100644
index 00000000..3a289252
--- /dev/null
+++ b/SampleProjects/Makefile/library.properties
@@ -0,0 +1,10 @@
+name=Makefile
+version=0.1.0
+author=James Foster <arduino@jgfoster.net>
+maintainer=James Foster <arduino@jgfoster.net>
+sentence=Show how to use a Makefile to shorten compile time
+paragraph=Show how to use a Makefile to shorten compile time
+category=Other
+url=https://github.com/Arduino-CI/arduino_ci/SampleProjects/Makefile
+architectures=avr,esp8266
+includes=Makefile.h
diff --git a/SampleProjects/Makefile/src/SharedLibrary.cpp b/SampleProjects/Makefile/src/SharedLibrary.cpp
new file mode 100644
index 00000000..35741047
--- /dev/null
+++ b/SampleProjects/Makefile/src/SharedLibrary.cpp
@@ -0,0 +1,5 @@
+#include "SharedLibrary.h"
+
+int main() {
+  return 0;
+}
diff --git a/SampleProjects/Makefile/src/SharedLibrary.h b/SampleProjects/Makefile/src/SharedLibrary.h
new file mode 100644
index 00000000..9ee81b24
--- /dev/null
+++ b/SampleProjects/Makefile/src/SharedLibrary.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <Arduino.h>
diff --git a/SampleProjects/Makefile/test.sh b/SampleProjects/Makefile/test.sh
new file mode 100755
index 00000000..bd79e5fd
--- /dev/null
+++ b/SampleProjects/Makefile/test.sh
@@ -0,0 +1,5 @@
+g++ -v
+cd SampleProjects/Makefile
+bundle install
+bundle exec ensure_arduino_installation.rb
+bundle exec arduino_ci.rb --skip-examples-compilation
diff --git a/SampleProjects/Makefile/test/test.cpp b/SampleProjects/Makefile/test/test.cpp
new file mode 100644
index 00000000..2fc73432
--- /dev/null
+++ b/SampleProjects/Makefile/test/test.cpp
@@ -0,0 +1,13 @@
+/*
+cd SampleProjects/Makefile
+bundle config --local path vendor/bundle
+bundle install
+bundle exec arduino_ci.rb --skip-examples-compilation
+*/
+
+#include <Arduino.h>
+#include <ArduinoUnitTests.h>
+
+unittest(test) { assertEqual(true, true); }
+
+unittest_main()
diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb
index 8ee111ea..e5f8b9b0 100644
--- a/lib/arduino_ci/cpp_library.rb
+++ b/lib/arduino_ci/cpp_library.rb
@@ -494,20 +494,24 @@ def test_args(aux_libraries, ci_gcc_config)
     # @return [Pathname] path to the compiled test executable
     def build_for_test(test_file, gcc_binary)
       executable = Pathname.new("#{BUILD_DIR}/#{test_file.basename}.bin").expand_path
-      File.delete(executable) if File.exist?(executable)
-      arg_sets = ["-std=c++0x", "-o", executable.to_s, "-L#{BUILD_DIR}", "-DARDUINO=100"]
-      if libasan?(gcc_binary)
-        arg_sets << [ # Stuff to help with dynamic memory mishandling
-          "-g", "-O1",
-          "-fno-omit-frame-pointer",
-          "-fno-optimize-sibling-calls",
-          "-fsanitize=address"
-        ]
+      if (File.file?("Makefile") and ArduinoCI::Host.os != :windows)
+        # we should already have everything built!
+      else
+        File.delete(executable) if File.exist?(executable)
+        arg_sets = ["-std=c++0x", "-o", executable.to_s, "-L#{BUILD_DIR}", "-DARDUINO=100"]
+        if libasan?(gcc_binary)
+          arg_sets << [ # Stuff to help with dynamic memory mishandling
+            "-g", "-O1",
+            "-fno-omit-frame-pointer",
+            "-fno-optimize-sibling-calls",
+            "-fsanitize=address"
+          ]
+        end
+        arg_sets << @test_args
+        arg_sets << [test_file.to_s, "-l#{LIBRARY_NAME}"]
+        args = arg_sets.flatten(1)
+        return nil unless run_gcc(gcc_binary, *args)
       end
-      arg_sets << @test_args
-      arg_sets << [test_file.to_s, "-l#{LIBRARY_NAME}"]
-      args = arg_sets.flatten(1)
-      return nil unless run_gcc(gcc_binary, *args)
 
       artifacts << executable
       executable
@@ -536,31 +540,37 @@ def build_shared_library(aux_libraries, gcc_binary, ci_gcc_config)
       suffix = OS.windows? ? "dll" : "so"
       full_lib_name = "#{BUILD_DIR}/lib#{LIBRARY_NAME}.#{suffix}"
       executable = Pathname.new(full_lib_name).expand_path
-      File.delete(executable) if File.exist?(executable)
-      arg_sets = ["-std=c++0x", "-shared", "-fPIC", "-Wl,-undefined,dynamic_lookup",
-                  "-o", executable.to_s, "-L#{BUILD_DIR}", "-DARDUINO=100"]
-      if libasan?(gcc_binary)
-        arg_sets << [ # Stuff to help with dynamic memory mishandling
-          "-g", "-O1",
-          "-fno-omit-frame-pointer",
-          "-fno-optimize-sibling-calls",
-          "-fsanitize=address"
-        ]
-      end
+      if (File.file?("Makefile") and ArduinoCI::Host.os != :windows)
+        @last_cmd = " $ make --jobs"
+        ret = Host.run_and_capture("export ARDUINO_CI=#{CI_CPP_DIR}; make --jobs")
+        return nil unless ret[:success]
+      else
+        File.delete(executable) if File.exist?(executable)
+        arg_sets = ["-std=c++0x", "-shared", "-fPIC", "-Wl,-undefined,dynamic_lookup",
+                    "-o", executable.to_s, "-L#{BUILD_DIR}", "-DARDUINO=100"]
+        if libasan?(gcc_binary)
+          arg_sets << [ # Stuff to help with dynamic memory mishandling
+            "-g", "-O1",
+            "-fno-omit-frame-pointer",
+            "-fno-optimize-sibling-calls",
+            "-fsanitize=address"
+          ]
+        end
 
-      # combine library.properties defs (if existing) with config file.
-      # TODO: as much as I'd like to rely only on the properties file(s), I think that would prevent testing 1.0-spec libs
-      # the following two take some time, so are cached when we build the shared library
-      @full_dependencies = all_arduino_library_dependencies!(aux_libraries)
-      @test_args = test_args(@full_dependencies, ci_gcc_config) # build full set of include directories to be cached for later
-
-      arg_sets << @test_args
-      arg_sets << cpp_files_arduino.map(&:to_s)  # Arduino.cpp, Godmode.cpp, and stdlib.cpp
-      arg_sets << cpp_files_unittest.map(&:to_s) # ArduinoUnitTests.cpp
-      arg_sets << cpp_files.map(&:to_s) # CPP files for the primary application library under test
-      arg_sets << cpp_files_libraries(@full_dependencies).map(&:to_s) # CPP files for all the libraries we depend on
-      args = arg_sets.flatten(1)
-      return nil unless run_gcc(gcc_binary, *args)
+        # combine library.properties defs (if existing) with config file.
+        # TODO: as much as I'd like to rely only on the properties file(s), I think that would prevent testing 1.0-spec libs
+        # the following two take some time, so are cached when we build the shared library
+        @full_dependencies = all_arduino_library_dependencies!(aux_libraries)
+        @test_args = test_args(@full_dependencies, ci_gcc_config) # build full set of include directories to be cached for later
+
+        arg_sets << @test_args
+        arg_sets << cpp_files_arduino.map(&:to_s)  # Arduino.cpp, Godmode.cpp, and stdlib.cpp
+        arg_sets << cpp_files_unittest.map(&:to_s) # ArduinoUnitTests.cpp
+        arg_sets << cpp_files.map(&:to_s) # CPP files for the primary application library under test
+        arg_sets << cpp_files_libraries(@full_dependencies).map(&:to_s) # CPP files for all the libraries we depend on
+        args = arg_sets.flatten(1)
+        return nil unless run_gcc(gcc_binary, *args)
+      end
 
       artifacts << executable
       executable

From b8fbddcecf05d12d5e189463a27f991b575bf6dc Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 19:51:26 -0700
Subject: [PATCH 2/8] - Spelling & linting - Fix error in logging failures

---
 exe/arduino_ci.rb             | 4 ++--
 lib/arduino_ci/cpp_library.rb | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/exe/arduino_ci.rb b/exe/arduino_ci.rb
index d3dfbaac..1b1af5ca 100755
--- a/exe/arduino_ci.rb
+++ b/exe/arduino_ci.rb
@@ -159,7 +159,7 @@ def display_files(pathname)
 # forcibly installs the dependency.  Each child dependency logs which parent requested it
 #
 # @param library_names [Array<String>] the list of libraries to install
-# @param on_behalf_of [String] the requestor of a given dependency
+# @param on_behalf_of [String] the requester of a given dependency
 # @param already_installed [Array<String>] the set of dependencies installed by previous steps
 # @return [Array<String>] The list of installed libraries
 def install_arduino_library_dependencies_h(library_names, on_behalf_of, already_installed)
@@ -456,7 +456,7 @@ def perform_unit_tests(cpp_library, file_config)
     @log.iputs
     compilers.each do |gcc_binary|
       # before compiling the tests, build a shared library of everything except the test code
-      next @log.failure_count += 1 unless build_shared_library(gcc_binary, p, config, cpp_library)
+      next unless build_shared_library(gcc_binary, p, config, cpp_library)
 
       # now build and run each test using the shared library build above
       config.allowable_unittest_files(cpp_library.test_files).each do |unittest_path|
diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb
index e5f8b9b0..44fb22dd 100644
--- a/lib/arduino_ci/cpp_library.rb
+++ b/lib/arduino_ci/cpp_library.rb
@@ -494,7 +494,7 @@ def test_args(aux_libraries, ci_gcc_config)
     # @return [Pathname] path to the compiled test executable
     def build_for_test(test_file, gcc_binary)
       executable = Pathname.new("#{BUILD_DIR}/#{test_file.basename}.bin").expand_path
-      if (File.file?("Makefile") and ArduinoCI::Host.os != :windows)
+      if File.file?("Makefile") && ArduinoCI::Host.os != :windows
         # we should already have everything built!
       else
         File.delete(executable) if File.exist?(executable)
@@ -540,9 +540,11 @@ def build_shared_library(aux_libraries, gcc_binary, ci_gcc_config)
       suffix = OS.windows? ? "dll" : "so"
       full_lib_name = "#{BUILD_DIR}/lib#{LIBRARY_NAME}.#{suffix}"
       executable = Pathname.new(full_lib_name).expand_path
-      if (File.file?("Makefile") and ArduinoCI::Host.os != :windows)
+      if File.file?("Makefile") && ArduinoCI::Host.os != :windows
         @last_cmd = " $ make --jobs"
         ret = Host.run_and_capture("export ARDUINO_CI=#{CI_CPP_DIR}; make --jobs")
+        @last_err = ret[:err]
+        @last_out = ret[:out]
         return nil unless ret[:success]
       else
         File.delete(executable) if File.exist?(executable)

From 229518d82c295de2205900143a7c432bedc50e2c Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 20:04:38 -0700
Subject: [PATCH 3/8] - Update Ruby version - Change order of linking

---
 .github/workflows/linux.yaml     | 14 +++++++-------
 .github/workflows/macos.yaml     | 12 ++++++------
 .github/workflows/windows.yaml   | 12 ++++++------
 SampleProjects/Makefile/Makefile | 10 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index ff962c28..4cd283b7 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test BusIO from scratch
         run: |
           g++ -v
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check style
         run: |
           g++ -v
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check functionality
         run: |
           g++ -v
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - TestSomething
         run: |
           g++ -v
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test NetworkLib from scratch
         run: |
           g++ -v
@@ -84,7 +84,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
 
@@ -94,6 +94,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Demo Makefile
         run: ./SampleProjects/Makefile/test.sh
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index 14006c29..c4cbdcb1 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check style
         run: |
           g++ -v
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check functionality
         run: |
           g++ -v
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - TestSomething
         run: |
           g++ -v
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test NetworkLib from scratch
         run: |
           g++ -v
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
 
@@ -79,7 +79,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Demo Makefile
         run: ./SampleProjects/Makefile/test.sh
             
\ No newline at end of file
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index eda0a1a8..2fe24f67 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check style
         run: |
           g++ -v
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check functionality
         run: |
           g++ -v
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - TestSomething
         run: |
           g++ -v
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test NetworkLib from scratch
         run: |
           g++ -v
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
 
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6
+          ruby-version: 3.2
       - name: Check usage - Demo Makefile
         run: ./SampleProjects/Makefile/test.sh
       
\ No newline at end of file
diff --git a/SampleProjects/Makefile/Makefile b/SampleProjects/Makefile/Makefile
index 302a5d00..7a7a51f9 100644
--- a/SampleProjects/Makefile/Makefile
+++ b/SampleProjects/Makefile/Makefile
@@ -33,21 +33,21 @@ $(BIN)/test.cpp.bin: $(BIN)/libarduino.so $(TEST)/test.cpp
 	echo "building test.cpp.bin"
 	$(GPP_TEST) -o $(BIN)/test.cpp.bin $(TEST)/test.cpp -larduino
 
-OBJECTS=$(BIN)/Arduino.o $(BIN)/Godmode.o $(BIN)/stdlib.o $(BIN)/ArduinoUnitTests.o \
+OBJECTS=$(BIN)/stdlib.o $(BIN)/Godmode.o $(BIN)/Arduino.o $(BIN)/ArduinoUnitTests.o \
 	$(BIN)/SharedLibrary.o 
 
 $(BIN)/libarduino.so: $(OBJECTS)
 	g++ $(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup -L$(BIN) $(INCLUDE) \
 	-o $(BIN)/libarduino.so $(OBJECTS)
 
-$(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp
-	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp
+$(BIN)/stdlib.o: $(ARDUINO_CI)/arduino/stdlib.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/stdlib.o $(ARDUINO_CI)/arduino/stdlib.cpp
 
 $(BIN)/Godmode.o: $(ARDUINO_CI)/arduino/Godmode.cpp
 	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Godmode.o $(ARDUINO_CI)/arduino/Godmode.cpp
 
-$(BIN)/stdlib.o: $(ARDUINO_CI)/arduino/stdlib.cpp
-	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/stdlib.o $(ARDUINO_CI)/arduino/stdlib.cpp
+$(BIN)/Arduino.o: $(ARDUINO_CI)/arduino/Arduino.cpp
+	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/Arduino.o $(ARDUINO_CI)/arduino/Arduino.cpp
 
 $(BIN)/ArduinoUnitTests.o: $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp
 	g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/ArduinoUnitTests.o $(ARDUINO_CI)/unittest/ArduinoUnitTests.cpp

From 29b45fbf525abe3c3cfd3f08fd34a6c8bff3edb6 Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 20:19:11 -0700
Subject: [PATCH 4/8] Revert Ruby version. Use Makefile on macOS only (for
 now).

---
 .github/workflows/linux.yaml   | 14 +++++++-------
 .github/workflows/macos.yaml   | 12 ++++++------
 .github/workflows/windows.yaml | 12 ++++++------
 lib/arduino_ci/cpp_library.rb  |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index 4cd283b7..ff962c28 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test BusIO from scratch
         run: |
           g++ -v
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check style
         run: |
           g++ -v
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check functionality
         run: |
           g++ -v
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - TestSomething
         run: |
           g++ -v
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test NetworkLib from scratch
         run: |
           g++ -v
@@ -84,7 +84,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
 
@@ -94,6 +94,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Demo Makefile
         run: ./SampleProjects/Makefile/test.sh
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index c4cbdcb1..14006c29 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check style
         run: |
           g++ -v
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check functionality
         run: |
           g++ -v
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - TestSomething
         run: |
           g++ -v
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test NetworkLib from scratch
         run: |
           g++ -v
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
 
@@ -79,7 +79,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Demo Makefile
         run: ./SampleProjects/Makefile/test.sh
             
\ No newline at end of file
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 2fe24f67..eda0a1a8 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check style
         run: |
           g++ -v
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check functionality
         run: |
           g++ -v
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - TestSomething
         run: |
           g++ -v
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test NetworkLib from scratch
         run: |
           g++ -v
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Test SharedLibrary should fail
         run: ./SampleProjects/SharedLibrary/test.sh
 
@@ -80,7 +80,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 2.6
       - name: Check usage - Demo Makefile
         run: ./SampleProjects/Makefile/test.sh
       
\ No newline at end of file
diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb
index 44fb22dd..d045dd0f 100644
--- a/lib/arduino_ci/cpp_library.rb
+++ b/lib/arduino_ci/cpp_library.rb
@@ -494,7 +494,7 @@ def test_args(aux_libraries, ci_gcc_config)
     # @return [Pathname] path to the compiled test executable
     def build_for_test(test_file, gcc_binary)
       executable = Pathname.new("#{BUILD_DIR}/#{test_file.basename}.bin").expand_path
-      if File.file?("Makefile") && ArduinoCI::Host.os != :windows
+      if File.file?("Makefile") && ArduinoCI::Host.os == :osx
         # we should already have everything built!
       else
         File.delete(executable) if File.exist?(executable)
@@ -540,7 +540,7 @@ def build_shared_library(aux_libraries, gcc_binary, ci_gcc_config)
       suffix = OS.windows? ? "dll" : "so"
       full_lib_name = "#{BUILD_DIR}/lib#{LIBRARY_NAME}.#{suffix}"
       executable = Pathname.new(full_lib_name).expand_path
-      if File.file?("Makefile") && ArduinoCI::Host.os != :windows
+      if File.file?("Makefile") && ArduinoCI::Host.os == :osx
         @last_cmd = " $ make --jobs"
         ret = Host.run_and_capture("export ARDUINO_CI=#{CI_CPP_DIR}; make --jobs")
         @last_err = ret[:err]

From 6d9320018a2264724024c027e213cf307a3b35bb Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 20:32:30 -0700
Subject: [PATCH 5/8] Does this fix the relocation problem in Linux?

---
 SampleProjects/Makefile/Makefile | 3 +--
 lib/arduino_ci/cpp_library.rb    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/SampleProjects/Makefile/Makefile b/SampleProjects/Makefile/Makefile
index 7a7a51f9..d66963bc 100644
--- a/SampleProjects/Makefile/Makefile
+++ b/SampleProjects/Makefile/Makefile
@@ -23,14 +23,13 @@ INCLUDE=-I$(ARDUINO_CI)/arduino \
   -I$(ARDUINO_CI)/unittest \
   -I$(LIBRARIES)/Makefile/src \
 
-GPP_TEST=g++ $(FLAGS) -L$(BIN) $(INCLUDE)
+GPP_TEST=g++ -no-pie -fon-pie $(FLAGS) -L$(BIN) $(INCLUDE)
 
 .PHONY : all
 all : $(BIN)/test.cpp.bin
 
 
 $(BIN)/test.cpp.bin: $(BIN)/libarduino.so $(TEST)/test.cpp
-	echo "building test.cpp.bin"
 	$(GPP_TEST) -o $(BIN)/test.cpp.bin $(TEST)/test.cpp -larduino
 
 OBJECTS=$(BIN)/stdlib.o $(BIN)/Godmode.o $(BIN)/Arduino.o $(BIN)/ArduinoUnitTests.o \
diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb
index d045dd0f..44fb22dd 100644
--- a/lib/arduino_ci/cpp_library.rb
+++ b/lib/arduino_ci/cpp_library.rb
@@ -494,7 +494,7 @@ def test_args(aux_libraries, ci_gcc_config)
     # @return [Pathname] path to the compiled test executable
     def build_for_test(test_file, gcc_binary)
       executable = Pathname.new("#{BUILD_DIR}/#{test_file.basename}.bin").expand_path
-      if File.file?("Makefile") && ArduinoCI::Host.os == :osx
+      if File.file?("Makefile") && ArduinoCI::Host.os != :windows
         # we should already have everything built!
       else
         File.delete(executable) if File.exist?(executable)
@@ -540,7 +540,7 @@ def build_shared_library(aux_libraries, gcc_binary, ci_gcc_config)
       suffix = OS.windows? ? "dll" : "so"
       full_lib_name = "#{BUILD_DIR}/lib#{LIBRARY_NAME}.#{suffix}"
       executable = Pathname.new(full_lib_name).expand_path
-      if File.file?("Makefile") && ArduinoCI::Host.os == :osx
+      if File.file?("Makefile") && ArduinoCI::Host.os != :windows
         @last_cmd = " $ make --jobs"
         ret = Host.run_and_capture("export ARDUINO_CI=#{CI_CPP_DIR}; make --jobs")
         @last_err = ret[:err]

From ab25fddd464e28d80a2f3267cc73a10c1cf90652 Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 20:34:45 -0700
Subject: [PATCH 6/8] Try again for relocation problem

---
 SampleProjects/Makefile/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SampleProjects/Makefile/Makefile b/SampleProjects/Makefile/Makefile
index d66963bc..9b7b4312 100644
--- a/SampleProjects/Makefile/Makefile
+++ b/SampleProjects/Makefile/Makefile
@@ -23,7 +23,7 @@ INCLUDE=-I$(ARDUINO_CI)/arduino \
   -I$(ARDUINO_CI)/unittest \
   -I$(LIBRARIES)/Makefile/src \
 
-GPP_TEST=g++ -no-pie -fon-pie $(FLAGS) -L$(BIN) $(INCLUDE)
+GPP_TEST=g++ -fPIC $(FLAGS) -L$(BIN) $(INCLUDE)
 
 .PHONY : all
 all : $(BIN)/test.cpp.bin

From 1563aeba58e064764abc3a605e73b6f755f96c61 Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 20:37:02 -0700
Subject: [PATCH 7/8] Compile everything with `-fPIC`

---
 SampleProjects/Makefile/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SampleProjects/Makefile/Makefile b/SampleProjects/Makefile/Makefile
index 9b7b4312..09c60b49 100644
--- a/SampleProjects/Makefile/Makefile
+++ b/SampleProjects/Makefile/Makefile
@@ -7,6 +7,7 @@ BIN=$(LIBRARIES)/Makefile/.arduino_ci
 FLAGS=-std=c++0x \
 	-Wno-deprecated-declarations \
   -DARDUINO=100 \
+  -fPIC \
   -g \
   -O1 \
   -fno-omit-frame-pointer \
@@ -23,7 +24,7 @@ INCLUDE=-I$(ARDUINO_CI)/arduino \
   -I$(ARDUINO_CI)/unittest \
   -I$(LIBRARIES)/Makefile/src \
 
-GPP_TEST=g++ -fPIC $(FLAGS) -L$(BIN) $(INCLUDE)
+GPP_TEST=g++ $(FLAGS) -L$(BIN) $(INCLUDE)
 
 .PHONY : all
 all : $(BIN)/test.cpp.bin
@@ -36,7 +37,7 @@ OBJECTS=$(BIN)/stdlib.o $(BIN)/Godmode.o $(BIN)/Arduino.o $(BIN)/ArduinoUnitTest
 	$(BIN)/SharedLibrary.o 
 
 $(BIN)/libarduino.so: $(OBJECTS)
-	g++ $(FLAGS) -shared -fPIC -Wl,-undefined,dynamic_lookup -L$(BIN) $(INCLUDE) \
+	g++ $(FLAGS) -shared -Wl,-undefined,dynamic_lookup -L$(BIN) $(INCLUDE) \
 	-o $(BIN)/libarduino.so $(OBJECTS)
 
 $(BIN)/stdlib.o: $(ARDUINO_CI)/arduino/stdlib.cpp

From 4d3871877df9f26886abc67fc5179aa6a88b3309 Mon Sep 17 00:00:00 2001
From: James Foster <git@jgfoster.net>
Date: Mon, 17 Jul 2023 20:59:11 -0700
Subject: [PATCH 8/8] Document changes.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6d1d188..0ac10906 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Support for optional Makefile to optimize compile performance
 
 ### Changed