Merge pull request #56 from dmadison/ci

Update CI Versions

Author: dmadison

.github/workflows/ci.yml

@@ -3,8 +3,8 @@ name: build
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  IDE_VERSION: 1.8.13
-  TEENSY_VERSION: 153
+  IDE_VERSION: 1.8.16
+  TEENSY_VERSION: 155
   IDE_LOCATION: /usr/local/share/arduino
 
 jobs:
@@ -62,7 +62,7 @@ jobs:
           sudo python ./.github/workflows/remove_teensyloader.py $IDE_LOCATION/hardware/teensy/avr/platform.txt
 
       - name: Install Libraries for Examples
-        run: arduino --install-library "Nintendo Extension Ctrl:0.8.1"
+        run: arduino --install-library "Nintendo Extension Ctrl:0.8.3"
 
       - name: Build Examples
         run: |

.github/workflows/remove_teensyloader.py

@@ -1,16 +1,24 @@
 #!/usr/bin/python
 
 import sys
+import re
 
-filepath = sys.argv[1]
-lines = []
+filepath = sys.argv[1]  # path of the file to parse
+lines = []  # list of lines from the file
+removed = False  # flag for if the line was removed from the file
 
 with open(filepath, 'r') as f:
 	lines = f.readlines()
 
 with open(filepath, 'w') as f:
+	# matching "postbuild" hooks of any number which call the "teensy_post_compile" application
+	pattern = re.compile("recipe\.hooks\.postbuild\.[0-9]\.pattern=\"{compiler\.path}teensy_post_compile\"")
 	for line in lines:
-		if not line.startswith("recipe.hooks.postbuild.3.pattern=\"{compiler.path}teensy_post_compile\""):  # remove post-compile trigger
+		if not pattern.match(line):
 			f.write(line)
 		else:
 			print("Removing line '{}'".format(line.strip('\n')))
+			removed = True
+
+if not removed:
+	raise RuntimeError("Did not find a matching line to remove in \"{}\"".format(filepath))