From 43db4506ecc37c46d615b6fad66352cccbc0f6a8 Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 19:46:38 -0800 Subject: [PATCH 1/7] set ci to run on dispatch --- .github/workflows/pull_request_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull_request_ci.yml b/.github/workflows/pull_request_ci.yml index 69f4d08a..a743dd6f 100644 --- a/.github/workflows/pull_request_ci.yml +++ b/.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: From cf9d1061ea59a78c10b0c89dcadf0d5a500c2557 Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 19:54:16 -0800 Subject: [PATCH 2/7] [EXECUTOR] Updated python version from 3.10 to 3.12 --- executor/Makefile | 2 +- executor/executor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/executor/Makefile b/executor/Makefile index ec1f2cfe..2065917b 100755 --- a/executor/Makefile +++ b/executor/Makefile @@ -5,7 +5,7 @@ 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 -PY_VER = python3.10 +PY_VER = python3.12 PY_LIB = -l$(PY_VER) CFLAGS = $(shell $(PY_VER)-config --cflags) diff --git a/executor/executor.c b/executor/executor.c index 6415c59e..2075e1c4 100644 --- a/executor/executor.c +++ b/executor/executor.c @@ -1,7 +1,7 @@ #define PY_SSIZE_T_CLEAN #include //for networking #include //for POSIX threads -#include // For Python's C API +#include // For Python's C API #include // Used to handle SIGTERM, SIGINT, SIGKILL #include //for standard int types #include //for i/o From f07e86b67b90907aacd942e21503fc7cea68a2e3 Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 20:22:15 -0800 Subject: [PATCH 3/7] [TESTS] updated tc_71_2 python error message for version 3.12 --- tests/integration/tc_71_2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration/tc_71_2.c b/tests/integration/tc_71_2.c index 6a2c6e03..6f6193e4 100644 --- a/tests/integration/tc_71_2.c +++ b/tests/integration/tc_71_2.c @@ -8,8 +8,10 @@ */ char check_output_6[] = - "line 25, in teleop_main\n" - " oops = 1 / 0\n" + "Traceback (most recent call last):\n" + " File \"/home/runner/work/runtime/runtime/tests/student_code/executor_sanity.py\", line 25, in teleop_main\n" + " oops = 1 / 0\n" + " ~~^~~" "ZeroDivisionError: division by zero\n"; int main() { From fe05c5d82b3763afe9a0c4dd0711d83432f87ede Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 20:28:59 -0800 Subject: [PATCH 4/7] [TESTS] updated tc_71_2 python error message for version 3.12, forgot a newline --- tests/integration/tc_71_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/tc_71_2.c b/tests/integration/tc_71_2.c index 6f6193e4..04b231f8 100644 --- a/tests/integration/tc_71_2.c +++ b/tests/integration/tc_71_2.c @@ -11,7 +11,7 @@ char check_output_6[] = "Traceback (most recent call last):\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() { From 09a0bea946a36d572986b413e71df0d2112036ec Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 20:46:25 -0800 Subject: [PATCH 5/7] [TESTS] updated tc_71_2 python error message for version 3.12, accounted for previous output --- tests/integration/tc_71_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/tc_71_2.c b/tests/integration/tc_71_2.c index 04b231f8..b69612ab 100644 --- a/tests/integration/tc_71_2.c +++ b/tests/integration/tc_71_2.c @@ -8,7 +8,7 @@ */ char check_output_6[] = - "Traceback (most recent call last):\n" + // "Traceback (most recent call last):\n" " File \"/home/runner/work/runtime/runtime/tests/student_code/executor_sanity.py\", line 25, in teleop_main\n" " oops = 1 / 0\n" " ~~^~~\n" From 412cd80bdc4c8f12a1cf565e054814caabac0fea Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 20:57:21 -0800 Subject: [PATCH 6/7] [TESTS] updated tc_71_2 python error message for version 3.12, fixed spacing --- tests/integration/tc_71_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/tc_71_2.c b/tests/integration/tc_71_2.c index b69612ab..2acc6a3e 100644 --- a/tests/integration/tc_71_2.c +++ b/tests/integration/tc_71_2.c @@ -9,9 +9,9 @@ char check_output_6[] = // "Traceback (most recent call last):\n" - " File \"/home/runner/work/runtime/runtime/tests/student_code/executor_sanity.py\", line 25, in teleop_main\n" - " oops = 1 / 0\n" - " ~~^~~\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() { From a710b5531e437ab737434051da9c31c2efce3b47 Mon Sep 17 00:00:00 2001 From: Brandon Wong Date: Wed, 5 Mar 2025 21:35:59 -0800 Subject: [PATCH 7/7] [TESTS] updated tc_71_2 python error message for version 3.12, removed commented line --- tests/integration/tc_71_2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/tc_71_2.c b/tests/integration/tc_71_2.c index 2acc6a3e..4579c479 100644 --- a/tests/integration/tc_71_2.c +++ b/tests/integration/tc_71_2.c @@ -8,7 +8,6 @@ */ char check_output_6[] = - // "Traceback (most recent call last):\n" " File \"/home/runner/work/runtime/runtime/tests/student_code/executor_sanity.py\", line 25, in teleop_main\n" " oops = 1 / 0\n" " ~~^~~\n"