Skip to content

Commit

Permalink
Adding github workflow to combine dependabot PRs, fix vale
Browse files Browse the repository at this point in the history
  • Loading branch information
aidenvaines-bjss committed Sep 2, 2024
1 parent 9b90af2 commit fef6c0f
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 1 deletion.
24 changes: 24 additions & 0 deletions .github/workflows/manual-combine-dependabot-prs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Combine Dependabot PRs

on:
workflow_dispatch:

permissions:
contents: write
pull-requests: write
checks: read

jobs:
combine-prs:
runs-on: ubuntu-latest

steps:
- name: combine-prs
id: combine-prs
uses: github/[email protected]
with:
ci_required: false
labels: dependencies
pr_title: Combined Dependabot PRs
combine_branch_name: dependabotCombined
pr_body_header: Combined Dependabot PRs
3 changes: 2 additions & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
pre-commit 3.6.0
gitleaks 8.15.3
tfsec 1.28.10
vale 3.6.0
# ==============================================================================
# The section below is reserved for Docker image versions.

Expand All @@ -15,7 +16,7 @@ tfsec 1.28.10
# docker/ghcr.io/nhs-england-tools/github-runner-image 20230909-321fd1e-rt@sha256:ce4fd6035dc450a50d3cbafb4986d60e77cb49a71ab60a053bb1b9518139a646 # SEE: https://github.com/nhs-england-tools/github-runner-image/pkgs/container/github-runner-image
# docker/hadolint/hadolint 2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 # SEE: https://hub.docker.com/r/hadolint/hadolint/tags
# docker/hashicorp/terraform 1.5.6@sha256:180a7efa983386a27b43657ed610e9deed9e6c3848d54f9ea9b6cb8a5c8c25f5 # SEE: https://hub.docker.com/r/hashicorp/terraform/tags
# docker/jdkato/vale v2.29.7@sha256:5ccfac574231b006284513ac3e4e9f38833989d83f2a68db149932c09de85149 # SEE: https://hub.docker.com/r/jdkato/vale/tags
# docker/jdkato/vale v3.6.0@sha256:0ef22c8d537f079633cfff69fc46f69a2196072f69cab1ab232e8a79a388e425 # SEE: https://hub.docker.com/r/jdkato/vale/tags
# docker/koalaman/shellcheck latest@sha256:e40388688bae0fcffdddb7e4dea49b900c18933b452add0930654b2dea3e7d5c # SEE: https://hub.docker.com/r/koalaman/shellcheck/tags
# docker/mstruebing/editorconfig-checker 2.7.1@sha256:dd3ca9ea50ef4518efe9be018d669ef9cf937f6bb5cfe2ef84ff2a620b5ddc24 # SEE: https://hub.docker.com/r/mstruebing/editorconfig-checker/tags
# docker/sonarsource/sonar-scanner-cli 5.0.1@sha256:494ecc3b5b1ee1625bd377b3905c4284e4f0cc155cff397805a244dee1c7d575 # SEE: https://hub.docker.com/r/sonarsource/sonar-scanner-cli/tags
1 change: 1 addition & 0 deletions infrastructure/terraform/etc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**.tfvars

0 comments on commit fef6c0f

Please sign in to comment.