Skip to content

Commit

Permalink
Merge pull request #3 from masterpointio/update-to-latest
Browse files Browse the repository at this point in the history
chore: update tools + add upgrade workflow
  • Loading branch information
gberenice authored Aug 6, 2024
2 parents df25c80 + 748432a commit 9ab1e72
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 13 deletions.
File renamed without changes.
34 changes: 34 additions & 0 deletions .github/workflows/trunk-upgrade.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Trunk Upgrade

on:
schedule:
# On the first day of every month @ 8am
- cron: 0 8 1 * *
workflow_dispatch: {}

permissions: read-all

jobs:
trunk-upgrade:
runs-on: ubuntu-latest
permissions:
# For trunk to create PRs
contents: write
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7

- name: Create Token for MasterpointBot App
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a #v2.1.0
id: generate-token
with:
app_id: ${{ secrets.MP_BOT_APP_ID }}
private_key: ${{ secrets.MP_BOT_APP_PRIVATE_KEY }}

- name: Upgrade
uses: trunk-io/trunk-action/upgrade@86b68ffae610a05105e90b1f52ad8c549ef482c2 #v1.1.16
with:
github-token: ${{ steps.generate-token.outputs.token }}
reviewers: "@masterpointio/masterpoint-internal"
prefix: "chore: "
23 changes: 14 additions & 9 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
version: 0.1
cli:
version: 1.20.1
version: 1.22.2
# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
plugins:
sources:
- id: trunk
ref: v1.4.3
ref: v1.6.1
uri: https://github.com/trunk-io/plugins
# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
runtimes:
Expand All @@ -20,15 +20,20 @@ lint:
# Incompatible with some Terraform features: https://github.com/tenable/terrascan/issues/1331
- terrascan
enabled:
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- git-diff-check
- markdownlint@0.39.0
- prettier@3.2.5
- tflint@0.50.3
- trivy@0.49.1
- trufflehog@3.68.2
- markdownlint@0.41.0
- prettier@3.3.3
- tflint@0.52.0
- trivy@0.54.1
- trufflehog@3.81.5
- [email protected]
ignore:
- linters: [tofu]
paths:
- "**/backend.tf.json"
actions:
enabled:
- trunk-announce
Expand Down
8 changes: 4 additions & 4 deletions aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# - all
registries:
- type: standard
ref: v4.144.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.210.0 # renovate: depName=aquaproj/aqua-registry
packages:
- name: terraform-docs/terraform-docs@v0.17.0
- name: hashicorp/terraform@v1.7.4
- name: opentofu/opentofu@v1.6.2
- name: terraform-docs/terraform-docs@v0.18.0
- name: hashicorp/terraform@v1.9.3
- name: opentofu/opentofu@v1.8.0

0 comments on commit 9ab1e72

Please sign in to comment.