Skip to content

Commit ba39f3e

Browse files
chore: resolve conflicts with upstream main
2 parents c994b2c + 783e818 commit ba39f3e

File tree

7 files changed

+582
-533
lines changed

7 files changed

+582
-533
lines changed

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
python -m pip install --upgrade pip
2626
pip install pre-commit
2727
- name: set PY
28-
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
29-
- uses: actions/cache@v4
28+
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> "$GITHUB_ENV"
29+
- uses: actions/cache@v5
3030
with:
3131
path: ~/.cache/pre-commit
3232
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/super-linter.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
name: Lint Code
2-
32
on:
43
push:
5-
branches: [ main ]
4+
branches: [main]
65
pull_request:
7-
branches: [ main ]
6+
branches: [main]
7+
8+
permissions:
9+
contents: read
10+
statuses: write
11+
pull-requests: write
12+
checks: write
813

914
jobs:
1015
super-linter:
@@ -21,3 +26,7 @@ jobs:
2126
DEFAULT_BRANCH: main
2227
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2328
PYTHON_PYLINT_CONFIG_FILE: .pylintrc
29+
VALIDATE_ALL_CODEBASE: false
30+
DISABLE_ERRORS: false
31+
VALIDATE_GITHUB_ACTIONS: true
32+
VALIDATE_JSON: true

.prettierrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
bracketSpacing: false
2+
singleQuote: true

0 commit comments

Comments
 (0)