Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Update pre-commit plugins and action #96

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ updates:
reviewers:
- memes
- package-ecosystem: "github-actions"
directory: "/"
directory: /
schedule:
interval: "weekly"
reviewers:
- memes
- package-ecosystem: "pip"
directory: "/"
directory: /
schedule:
interval: "weekly"
reviewers:
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# These github actions will perform linting using pre-commit.
# yamllint disable rule:line-length
# spell-checker: disable
# These github actions will update Terraform section(s) of README(s), and
# perform linting using pre-commit.
---
# yamllint disable rule:line-length
# spell-checker: ignore yamllint chmod
name: pre-commit

# yamllint disable-line rule:truthy
Expand All @@ -21,22 +22,19 @@ jobs:
BUNDLE_WITH: dev
steps:
- uses: actions/checkout@v4
- name: install talisman
- name: Install talisman
run: |
sudo curl -sLo /usr/local/bin/talisman https://github.com/thoughtworks/talisman/releases/download/v1.32.0/talisman_linux_amd64
sudo chmod 0755 /usr/local/bin/talisman
- name: Install terraform-docs
run: |
sudo sh -c 'curl -sL https://github.com/terraform-docs/terraform-docs/releases/download/v0.17.0/terraform-docs-v0.17.0-linux-amd64.tar.gz | tar xzf - -C /usr/local/bin'
sudo sh -c 'curl -sL https://github.com/terraform-docs/terraform-docs/releases/download/v0.19.0/terraform-docs-v0.19.0-linux-amd64.tar.gz | tar xzf - -C /usr/local/bin'
sudo chmod 0755 /usr/local/bin/terraform-docs
- name: Install ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.0'
bundler-cache: true
- name: Install python
uses: actions/setup-python@v5
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Pre-commit
uses: pre-commit/action@v3.0.1
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.5
bundler-cache: true
- uses: pre-commit/action@v3.0.1
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ repos:
types:
- file
- yaml
exclude: kitchen\.ya?ml$
exclude: (kitchen\.yml|\.github/ISSUE_TEMPLATE/config\.yml)$
entry: yamllint --strict
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.90.0
rev: v1.96.1
hooks:
- id: terraform_fmt
- id: terraform_docs
args:
- '--args=--sort-by=required --hide=providers'
- repo: https://github.com/compilerla/conventional-pre-commit
rev: v3.2.0
rev: v3.6.0
hooks:
- id: conventional-pre-commit
stages:
Expand All @@ -28,7 +28,7 @@ repos:
hooks:
- id: rubocop
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-executables-have-shebangs
- id: check-merge-conflict
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# frozen_string_literal: true
# frozen_string_literal: true

ruby '3.3.0'
ruby '3.3.5'

source 'https://rubygems.org'
source 'https://rubygems.org/'
gem 'kitchen-terraform', '~> 7.0.2'
# Nori 2.7 causes problems with inspec-gcp, so pin to 2.6
# See https://github.com/inspec/inspec-gcp/issues/596
gem 'nori', '~> 2.6.0'
group :dev do
gem 'reek', '~> 6.3.0', require: false
# transitive dependency via cookstyle forces rubocop 1.25
# gem 'rubocop', '~> 1.62.1', require: false
# Transitive dependency on rubocop v1.25.1 via kitchen-terraform
# gem 'rubocop', '~> 1.67.0', require: false
end
2 changes: 1 addition & 1 deletion test/profiles/f5-xc-role/inspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ supports:
depends:
- name: inspec-gcp
git: https://github.com/inspec/inspec-gcp.git
tag: v1.11.98
tag: v1.11.135
inputs:
- name: output_role_id
type: string
Expand Down
Loading