From cee4508e090ab8d2d293f216e0dbc80eb56d5694 Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Sat, 5 Feb 2022 14:29:09 -0600 Subject: [PATCH] continues -> continuous (#3895) --- README.md | 2 +- java_console/ui/src/main/java/com/rusefi/StartupFrame.java | 4 ++-- misc/SoftwareDevelopmentProcess.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c334826f8b..1b4999cebe 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Important note - we now use submodules: * [Simulator](/simulator) win32 or posix version of firmware allows to explore without any hardware * [Unit Tests](/unit_tests) Unit tests of firmware pieces * [Misc tools](/java_tools) Misc development utilities - * [misc/Jenkins](/misc/jenkins) Jenkins Continues Integration scripts + * [misc/Jenkins](/misc/jenkins) Jenkins Continuous Integration scripts * [Software Development process](misc/SoftwareDevelopmentProcess.md) * [Work in progress status](work_in_progress.md) diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java index 2f5cc445f4..d2d291c539 100644 --- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java @@ -280,7 +280,7 @@ public class StartupFrame { /** * Here we listen to keystrokes while console start-up frame is being displayed and if magic "test" word is typed - * we launch a functional test on real hardware, same as Jenkins runs within continues integration + * we launch a functional test on real hardware, same as Jenkins runs within continuous integration */ @NotNull private KeyListener functionalTestEasterEgg() { @@ -349,4 +349,4 @@ public class StartupFrame { combo.setSelectedItem(defaultSpeed); return combo; } -} \ No newline at end of file +} diff --git a/misc/SoftwareDevelopmentProcess.md b/misc/SoftwareDevelopmentProcess.md index 2a81da1a0c..e3a92db165 100644 --- a/misc/SoftwareDevelopmentProcess.md +++ b/misc/SoftwareDevelopmentProcess.md @@ -1,7 +1,7 @@ rusEfi firmware development model is "stable master". We do not have release branches, we only have master with -continues integration and *limited* automated testing. +continuous integration and *limited* automated testing. By default, each Pull Request is expected to be complete and expected to not break existing functionality. If a Pull Request is a work-in-progress or draft or not intended for merge yet, it should be clearly marked with "[WIP]" prefix in the title. @@ -13,8 +13,8 @@ It is usually helpful to discuss proposed changes prior to Pull Requests - we ha TODO: we have an urgent need to make gate check more reliable & expand what's included into gate check -The primary hardware platform for rusEfi is stm32f4 - as of November 2019, only stm32f4 has hardware test continues integration. +The primary hardware platform for rusEfi is stm32f4 - as of November 2019, only stm32f4 has hardware test continuous integration. -See also [Functional tests CI info](jenkins/functional_test_and_build_bundle/readme.md) \ No newline at end of file +See also [Functional tests CI info](jenkins/functional_test_and_build_bundle/readme.md)