Merge branch 'main' into dependabot/github_actions/github/codeql-acti…

…on-2.21.8
z-shell · Sep 21, 2023 · b6f99c2 · b6f99c2
2 parents 3cd1dfd + d47f780
commit b6f99c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml
@@ -106,7 +106,7 @@ jobs:
         run: ${{ inputs.pnpm_arguments }}
       - if: ${{ inputs.action == 'check' }}
         name: "✨ Check"
-        uses: trunk-io/trunk-action@883e222ef19201ad402ef73e58101ec8186d7d54
+        uses: trunk-io/trunk-action@97ecd21fe6c743bf7a606791584b683a7995c70e
         with:
           trunk-path: ${{ inputs.trunk_path }}
           trunk-token: ${{ secrets.trunk-token }}
@@ -115,4 +115,4 @@ jobs:
           arguments: ${{ inputs.arguments }}
       - if: ${{ inputs.action == 'upgrade' }}
         name: "✨ Upgrade"
-        uses: trunk-io/trunk-action/upgrade@v1.1.7
+        uses: trunk-io/trunk-action/upgrade@97ecd21fe6c743bf7a606791584b683a7995c70e
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -16,13 +16,13 @@ plugins:
       ref: v1.2.3
 lint:
   disabled:
+    - terrascan
     - trivy
     - checkov
     - trufflehog
     - yamllint
   enabled:
     - [email protected]
-    - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]