Skip to content

Commit 25ff41b

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents f7a1258 + 094de9e commit 25ff41b

4 files changed

Lines changed: 41 additions & 43 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"name": "BASH Dev Container",
3-
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4-
"features": {
5-
"ghcr.io/devcontainers-community/npm-features/prettier:1": {
6-
"plugins": "prettier-plugin-sh"
7-
},
8-
"ghcr.io/devcontainers-extra/features/actionlint:1": {},
9-
"ghcr.io/devcontainers-extra/features/checkov:1": {},
10-
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
11-
"ghcr.io/devcontainers-extra/features/shellcheck:1": {},
12-
"ghcr.io/devcontainers-extra/features/yamllint:2": {},
13-
"ghcr.io/devcontainers/features/github-cli:1": {}
14-
},
15-
"customizations": {
16-
"vscode": {
17-
"extensions": [
18-
"DavidAnson.vscode-markdownlint",
19-
"editorconfig.editorconfig",
20-
"esbenp.prettier-vscode",
21-
"github.vscode-github-actions",
22-
"GitHub.vscode-pull-request-github",
23-
"redhat.vscode-yaml",
24-
"timonwong.shellcheck",
25-
"yzhang.markdown-all-in-one"
26-
]
27-
}
28-
},
29-
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
2+
"name": "BASH Dev Container",
3+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
4+
"features": {
5+
"ghcr.io/devcontainers-community/npm-features/prettier:1": {
6+
"plugins": "prettier-plugin-sh"
7+
},
8+
"ghcr.io/devcontainers-extra/features/actionlint:1": {},
9+
"ghcr.io/devcontainers-extra/features/checkov:1": {},
10+
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
11+
"ghcr.io/devcontainers-extra/features/shellcheck:1": {},
12+
"ghcr.io/devcontainers-extra/features/yamllint:2": {},
13+
"ghcr.io/devcontainers/features/github-cli:1": {}
14+
},
15+
"customizations": {
16+
"vscode": {
17+
"extensions": [
18+
"DavidAnson.vscode-markdownlint",
19+
"editorconfig.editorconfig",
20+
"esbenp.prettier-vscode",
21+
"github.vscode-github-actions",
22+
"GitHub.vscode-pull-request-github",
23+
"redhat.vscode-yaml",
24+
"timonwong.shellcheck",
25+
"yzhang.markdown-all-in-one"
26+
]
27+
}
28+
},
29+
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template"
3030
}

.github/workflows/action-super-linter.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
- name: Checkout code
2828
uses: actions/checkout@v6
2929
with:
30-
# Full clone required so super-linter can resolve GITHUB_BEFORE_SHA.
30+
# super-linter needs the full git history to get the
31+
# list of files that changed across commits
3132
fetch-depth: 0
32-
fetch-tags: false
3333
persist-credentials: false
3434

3535
- name: Install Prettier plugins (for summary formatting)
@@ -41,15 +41,13 @@ jobs:
4141
env:
4242
# To report GitHub Actions status checks
4343
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
DEFAULT_BRANCH: ${{ github.ref_name }}
4544
VALIDATE_BIOME_FORMAT: false
4645
VALIDATE_BIOME_LINT: false
4746
VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
4847
VALIDATE_JSCPD: false
4948
VALIDATE_JSON_PRETTIER: false
5049
VALIDATE_MARKDOWN_PRETTIER: false
5150
VALIDATE_NATURAL_LANGUAGE: false
52-
VALIDATE_PYTHON_RUFF_FORMAT: false
5351
VALIDATE_SHELL_SHFMT: false
5452
VALIDATE_TRIVY: false
5553
VALIDATE_YAML_PRETTIER: false

.prettierrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"plugins": ["prettier-plugin-sh"]
2+
"plugins": ["prettier-plugin-sh"]
33
}

.vscode/extensions.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"recommendations": [
3-
"DavidAnson.vscode-markdownlint",
4-
"editorconfig.editorconfig",
5-
"esbenp.prettier-vscode",
6-
"github.vscode-github-actions",
7-
"GitHub.vscode-pull-request-github",
8-
"redhat.vscode-yaml",
9-
"timonwong.shellcheck",
10-
"yzhang.markdown-all-in-one"
11-
]
2+
"recommendations": [
3+
"DavidAnson.vscode-markdownlint",
4+
"editorconfig.editorconfig",
5+
"esbenp.prettier-vscode",
6+
"github.vscode-github-actions",
7+
"GitHub.vscode-pull-request-github",
8+
"redhat.vscode-yaml",
9+
"timonwong.shellcheck",
10+
"yzhang.markdown-all-in-one"
11+
]
1212
}

0 commit comments

Comments
 (0)