merged master into executor_rewrite branch

Author: BrandonWong14

.github/workflows/pull_request_ci.yml

@@ -13,6 +13,7 @@ on:
     types: [opened, synchronize]
   push:
     branches: [master]
+  workflow_dispatch:
 
 # Here is the list of jobs that this workflow will run. There is only one job.
 jobs:

executor/Makefile

@@ -5,7 +5,11 @@ LIBS=-pthread -lrt -Wall -export-dynamic -fPIC
 SRCS = executor.c gamestate_filter.c ../logger/logger.c ../runtime_util/runtime_util.c ../shm_wrapper/shm_wrapper.c
 
 # Python compilation definitions
+<<<<<<< HEAD
 PY_VER = python3.11
+=======
+PY_VER = python3.12
+>>>>>>> c02bcc59add84236ca74b9652ff8e2528b2c1394
 PY_LIB = -l$(PY_VER)
 CFLAGS = $(shell $(PY_VER)-config --cflags)
 

executor/executor.c

@@ -1,7 +1,11 @@
 #define PY_SSIZE_T_CLEAN
 #include <arpa/inet.h>          //for networking
 #include <pthread.h>            //for POSIX threads
+<<<<<<< HEAD
 #include <python3.11/Python.h>  // For Python's C API
+=======
+#include <python3.12/Python.h>  // For Python's C API
+>>>>>>> c02bcc59add84236ca74b9652ff8e2528b2c1394
 #include <signal.h>             // Used to handle SIGTERM, SIGINT, SIGKILL
 #include <stdint.h>             //for standard int types
 #include <stdio.h>              //for i/o

tests/integration/tc_71_2.c

@@ -8,8 +8,9 @@
  */
 
 char check_output_6[] =
-    "line 25, in teleop_main\n"
+    "  File \"/home/runner/work/runtime/runtime/tests/student_code/executor_sanity.py\", line 25, in teleop_main\n"
     "    oops = 1 / 0\n"
+    "           ~~^~~\n"
     "ZeroDivisionError: division by zero\n";
 
 int main() {