From 47e4f1e9d4589044e1c030445998b0b45e4bf94a Mon Sep 17 00:00:00 2001 From: Johanna England Date: Fri, 19 Jan 2024 10:47:45 +0100 Subject: [PATCH 1/2] Correct flake8 default branch to main --- .github/workflows/linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 17c6d2c..8f1a2e4 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -55,7 +55,7 @@ jobs: uses: github/super-linter/slim@v5 env: VALIDATE_ALL_CODEBASE: false - DEFAULT_BRANCH: master + DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Add validation for other languages here or comment out all to validate all languages VALIDATE_PYTHON_FLAKE8: true From f49a5d1d0aab59879c9888e0479c48bdc80ba180 Mon Sep 17 00:00:00 2001 From: Johanna England Date: Fri, 19 Jan 2024 10:50:41 +0100 Subject: [PATCH 2/2] Run linter github action on all pull requests and all push to main --- .github/workflows/linter.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 8f1a2e4..9b1d3fe 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -11,10 +11,8 @@ name: Lint Code Base ###################################################### on: push: - # branches-ignore: main - # Include the line above to not run when pushing to main - pull_request: branches: main + pull_request: ############### # Set the Job #