aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Schonning <nschonni@gmail.com>2022-12-15 21:11:52 -0500
committerGitHub <noreply@github.com>2022-12-16 11:11:52 +0900
commit3c70f0a9c96f282b3b6e9c02a2d3ab1eaa861ee6 (patch)
treef73d3df63469c96e0c79e2e9b9e34cad32f7376f
parentf847f67410c75036edb2c4b45d0db048af0481c9 (diff)
downloadmastodon-3c70f0a9c96f282b3b6e9c02a2d3ab1eaa861ee6.tar
mastodon-3c70f0a9c96f282b3b6e9c02a2d3ab1eaa861ee6.tar.gz
mastodon-3c70f0a9c96f282b3b6e9c02a2d3ab1eaa861ee6.tar.bz2
mastodon-3c70f0a9c96f282b3b6e9c02a2d3ab1eaa861ee6.zip
Run Prettier on YML files (#22345)
-rw-r--r--.github/workflows/codeql.yml77
-rw-r--r--.rubocop.yml2
2 files changed, 39 insertions, 40 deletions
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 88ac2fb08..8534501d4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -1,11 +1,11 @@
-name: "CodeQL"
+name: 'CodeQL'
on:
push:
- branches: [ "main" ]
+ branches: ['main']
pull_request:
# The branches below must be a subset of the branches above
- branches: [ "main" ]
+ branches: ['main']
schedule:
- cron: '22 6 * * 1'
@@ -21,43 +21,42 @@ jobs:
strategy:
fail-fast: false
matrix:
- language: [ 'javascript', 'ruby' ]
+ language: ['javascript', 'ruby']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
steps:
- - name: Checkout repository
- uses: actions/checkout@v3
-
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
-
- # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
- # queries: security-extended,security-and-quality
-
-
- # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v2
-
- # ℹī¸ Command-line programs to run using the OS shell.
- # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
- # If the Autobuild fails above, remove it and uncomment the following three lines.
- # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
- # - run: |
- # echo "Run, Build Application using script"
- # ./location_of_script_within_repo/buildscript.sh
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
- with:
- category: "/language:${{matrix.language}}"
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+
+ # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+ # queries: security-extended,security-and-quality
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+ # ℹī¸ Command-line programs to run using the OS shell.
+ # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+ # If the Autobuild fails above, remove it and uncomment the following three lines.
+ # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+ # - run: |
+ # echo "Run, Build Application using script"
+ # ./location_of_script_within_repo/buildscript.sh
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
+ with:
+ category: '/language:${{matrix.language}}'
diff --git a/.rubocop.yml b/.rubocop.yml
index 67284fe34..3c9223470 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -250,7 +250,7 @@ Metrics/ModuleLength:
Metrics/ParameterLists:
Max: 5 # RuboCop default 5
- CountKeywordArgs: true # RuboCop default true
+ CountKeywordArgs: true # RuboCop default true
MaxOptionalParameters: 3 # RuboCop default 3
Exclude:
- app/models/concerns/account_interactions.rb