From da15ffcab0986558a2781bb67b0042c10577d558 Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Thu, 28 Aug 2025 17:03:13 +0800 Subject: [PATCH 1/2] Update twister.yaml --- .github/workflows/twister.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml index d5f214be9fb36..1883c9597234c 100644 --- a/.github/workflows/twister.yaml +++ b/.github/workflows/twister.yaml @@ -24,7 +24,6 @@ concurrency: jobs: twister-build-prep: - if: github.repository_owner == 'zephyrproject-rtos' runs-on: ubuntu-24.04 outputs: subset: ${{ steps.output-services.outputs.subset }} @@ -90,7 +89,9 @@ jobs: export ZEPHYR_BASE=${PWD} export ZEPHYR_TOOLCHAIN_VARIANT=zephyr python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request -t $TESTS_PER_BUILDER + if [ -s .testplan ]; then + cat .testplan cat .testplan >> $GITHUB_ENV else echo "TWISTER_NODES=${MATRIX_SIZE}" >> $GITHUB_ENV @@ -116,7 +117,9 @@ jobs: else size=0 fi - + echo "=======" + echo ${subset} + echo ${size} echo "subset=${subset}" >> $GITHUB_OUTPUT echo "size=${size}" >> $GITHUB_OUTPUT echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT From 51cf641d940042d09287ef42a900f5272e717686 Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Thu, 28 Aug 2025 17:20:39 +0800 Subject: [PATCH 2/2] Fix preprocessor directive closing comment --- drivers/can/can_mcux_flexcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c index e3a8caac98916..aeb086bb077f1 100644 --- a/drivers/can/can_mcux_flexcan.c +++ b/drivers/can/can_mcux_flexcan.c @@ -627,7 +627,7 @@ static void mcux_flexcan_fd_to_can_frame(const flexcan_fd_frame_t *src, dest->timestamp = src->timestamp; #endif /* CAN_RX_TIMESTAMP */ } -#endif /* CONFIG_CAN_MCUX_FLEXCAN_FD */ +#endif /* CONFIG_CAN_MCUX_FLEXCAN_FDasdfasdfasdf */ static void mcux_flexcan_can_filter_to_mbconfig(const struct can_filter *src, flexcan_rx_mb_config_t *dest,