From eef7b50ea3684f845d9b089128063a8db6ed967b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 11:02:18 -0500
Subject: [PATCH 1/2] Bump snakemake from 6.8.0 to 6.8.1 in /dependencies
 (#2004)

* Bump snakemake from 6.8.0 to 6.8.1 in /dependencies

Bumps [snakemake](https://github.com/snakemake/snakemake) from 6.8.0 to 6.8.1.
- [Release notes](https://github.com/snakemake/snakemake/releases)
- [Commits](https://github.com/snakemake/snakemake/compare/v6.8.0...v6.8.1)

---
updated-dependencies:
- dependency-name: snakemake
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fixed dead var

* typo in name

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lukas Gravley <admiralawkbar@github.com>
---
 dependencies/Pipfile.lock | 10 +++++-----
 lib/linter.sh             |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dependencies/Pipfile.lock b/dependencies/Pipfile.lock
index 51d6d750..d9199a83 100644
--- a/dependencies/Pipfile.lock
+++ b/dependencies/Pipfile.lock
@@ -354,7 +354,7 @@
                 "sha256:0aa34983401d42f6f69a9c9be0fa5fe6f0cb9fa8ada4cca3a0145d6d8dd9bf74",
                 "sha256:9d0296e25ca21b2235e70a0001acda498f52896b3453ea44d04cf53ceeb5ef72"
             ],
-            "markers": "python_full_version >= '3.6.2' and python_full_version < '4.0.0'",
+            "markers": "python_version < '4.0' and python_full_version >= '3.6.2'",
             "version": "==6.4.1"
         },
         "docutils": {
@@ -995,7 +995,7 @@
                 "sha256:016fa105f34b69c434e7f908bb5bd7fefa9616efdb218a2917117683a6394ce5",
                 "sha256:44bb3f9553d00b3c8938abf89828df870322b9ba43caf3b12bb7758debdc6dec"
             ],
-            "markers": "python_version >= '3.6' and python_full_version < '4.0.0'",
+            "markers": "python_version >= '3.6' and python_version < '4.0'",
             "version": "==10.11.0"
         },
         "ruamel.yaml": {
@@ -1075,10 +1075,10 @@
         },
         "snakemake": {
             "hashes": [
-                "sha256:152b791eef62955d8cdd6132b7a1af9b3d3b35cbf371d9cfb6926cd6c4ff4f00"
+                "sha256:3f1dd331d8162ebde78e41290f6a51204caa4ffe77b619b4847809b9dc8c3cd0"
             ],
             "index": "pypi",
-            "version": "==6.8.0"
+            "version": "==6.8.1"
         },
         "sqlfluff": {
             "hashes": [
@@ -1197,7 +1197,7 @@
                 "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece",
                 "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'",
             "version": "==1.26.7"
         },
         "wcmatch": {
diff --git a/lib/linter.sh b/lib/linter.sh
index 87c05dcc..80f2adb0 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -94,7 +94,7 @@ EDITORCONFIG_FILE_NAME="${EDITORCONFIG_FILE_NAME:-.ecrc}"
 # shellcheck disable=SC2034  # Variable is referenced indirectly
 GITHUB_ACTIONS_FILE_NAME="${GITHUB_ACTIONS_CONFIG_FILE:-actionlint.yml}"
 # shellcheck disable=SC2034  # Variable is referenced indirectly
-GITLEAKS_FILE_NAME="${GITLEAKS_CONFIG_FILE:.gitleaks.toml}"
+GITLEAKS_FILE_NAME="${GITLEAKS_CONFIG_FILE:-.gitleaks.toml}"
 # shellcheck disable=SC2034  # Variable is referenced indirectly
 GHERKIN_FILE_NAME=".gherkin-lintrc"
 # shellcheck disable=SC2034  # Variable is referenced indirectly
@@ -207,7 +207,7 @@ LANGUAGE_ARRAY=('ANSIBLE' 'ARM' 'BASH' 'BASH_EXEC' 'CLANG_FORMAT'
   'KOTLIN' 'LATEX' 'LUA' 'MARKDOWN' 'OPENAPI' 'PERL' 'PHP_BUILTIN' 'PHP_PHPCS'
   'PHP_PHPSTAN' 'PHP_PSALM' 'POWERSHELL' 'PROTOBUF' 'PYTHON_BLACK'
   'PYTHON_PYLINT' 'PYTHON_FLAKE8' 'PYTHON_ISORT' 'PYTHON_MYPY' 'R' 'RAKU' 'RUBY'
-  'RUST_2015' 'RUST_2018' 'RUST_CLIPPY' 'SECRET' 'SHELL_SHFMT' 'SNAKEMAKE_LINT'
+  'RUST_2015' 'RUST_2018' 'RUST_CLIPPY' 'SHELL_SHFMT' 'SNAKEMAKE_LINT'
   'SNAKEMAKE_SNAKEFMT' 'STATES' 'SQL' 'SQLFLUFF' 'TEKTON' 'TERRAFORM_TFLINT'
   'TERRAFORM_TERRASCAN' 'TERRAGRUNT' 'TSX' 'TYPESCRIPT_ES' 'TYPESCRIPT_STANDARD'
   'XML' 'YAML')

From a6672db9d2737b20e38351fcdb98349f7b8ac0de Mon Sep 17 00:00:00 2001
From: Patrick Huy <66731536+patrickhuy@users.noreply.github.com>
Date: Mon, 27 Sep 2021 18:02:36 +0200
Subject: [PATCH 2/2] docs: add example to actionlint.yml (#1992)

Co-authored-by: Lukas Gravley <admiralawkbar@github.com>
---
 TEMPLATES/actionlint.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TEMPLATES/actionlint.yml b/TEMPLATES/actionlint.yml
index 00dc4901..8dd10017 100644
--- a/TEMPLATES/actionlint.yml
+++ b/TEMPLATES/actionlint.yml
@@ -1,3 +1,5 @@
 ---
 self-hosted-runner:
   # Labels of self-hosted runner in array of string
+  # labels:
+  # - mylabel