From 291d41998ceb084d0c149ea5210688cd94d8b425 Mon Sep 17 00:00:00 2001 From: jreeve-nv Date: Thu, 29 Aug 2024 12:58:19 +1200 Subject: [PATCH 1/2] Update 24-diagnosing-issues-improving-robustness.md Corrected error where the automating pylint section creates a branch named `pylint-ci` but then merges `test-suite` back into `develop`. Now the merge back into `develop` is with the `pylint-ci` branch. --- _episodes/24-diagnosing-issues-improving-robustness.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_episodes/24-diagnosing-issues-improving-robustness.md b/_episodes/24-diagnosing-issues-improving-robustness.md index 2db5c82b6..6ef7533b6 100644 --- a/_episodes/24-diagnosing-issues-improving-robustness.md +++ b/_episodes/24-diagnosing-issues-improving-robustness.md @@ -772,7 +772,7 @@ Then we can just add this to our repo and trigger a build: ~~~ $ git add .github/workflows/main.yml $ git commit -m "Add Pylint run to build" -$ git push origin test-suite +$ git push origin pylint-ci ~~~ {: .language-bash} From 2d0831a90ee74e8d5961a27b2000c7e480bccb3d Mon Sep 17 00:00:00 2001 From: bielsnohr Date: Mon, 21 Oct 2024 18:32:01 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20Remove=20creation=20and=20re?= =?UTF-8?q?ference=20to=20the=20superfluous=20pylint-ci=20branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../24-diagnosing-issues-improving-robustness.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/_episodes/24-diagnosing-issues-improving-robustness.md b/_episodes/24-diagnosing-issues-improving-robustness.md index 6ef7533b6..8e65939ea 100644 --- a/_episodes/24-diagnosing-issues-improving-robustness.md +++ b/_episodes/24-diagnosing-issues-improving-robustness.md @@ -742,15 +742,7 @@ you may cause yourself some trouble which may be difficult to trace). It may be hard to remember to run linter tools every now and then. Luckily, we can now add this Pylint execution to our continuous integration builds as one of the extra tasks. -Since we're adding an extra feature to our CI workflow, -let's start this from a new feature branch from the `develop` branch: - -~~~ -$ git switch -c pylint-ci develop # note a shorthand for creating a branch from another and switching to it -~~~ -{: .language-bash} - -Then to add Pylint to our CI workflow, +To add Pylint to our CI workflow, we can add the following step to our `steps` in `.github/workflows/main.yml`: ~~~ @@ -772,7 +764,7 @@ Then we can just add this to our repo and trigger a build: ~~~ $ git add .github/workflows/main.yml $ git commit -m "Add Pylint run to build" -$ git push origin pylint-ci +$ git push origin test-suite ~~~ {: .language-bash}