Skip to content

Commit

Permalink
Merge branch 'bso' of https://github.com/nwjgit/oldschoolbot into com…
Browse files Browse the repository at this point in the history
…pCapeSimItems
  • Loading branch information
nwjgit committed Oct 13, 2024
2 parents 0aa88fa + 2c1314c commit 862a675
Show file tree
Hide file tree
Showing 2,377 changed files with 68,635 additions and 27,000 deletions.
6 changes: 5 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ dist
node_modules
coverage
.yarn
.tests
.tests
.git
.env.local
docs
data
4 changes: 3 additions & 1 deletion .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ CLIENT_ID=111398433321891634
BOT_TOKEN=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
TEST=true
CI=true
YARN_ENABLE_HARDENED_MODE=0
YARN_ENABLE_HARDENED_MODE=0
DATABASE_URL="postgresql://postgres:postgres@localhost:4444/osb_test?schema=public"
NODE_NO_WARNINGS=1
24 changes: 5 additions & 19 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,8 @@
LICENSE text
AUTHORS text

*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.ico binary
*.mov binary
*.mp4 binary
*.mp3 binary
*.flv binary
*.fla binary
*.swf binary
*.gz binary
*.zip binary
*.7z binary
*.ttf binary
*.eot binary
*.woff binary
*.pyc binary
*.pdf binary
*.webp -text diff
*.ttf -text diff
*.eot -text diff
*.woff -text diff
*.woff2 -text diff
4 changes: 4 additions & 0 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ on:
branches:
- master
- bso
paths-ignore:
- "docs/**"
pull_request:
paths-ignore:
- "docs/**"

jobs:
test:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ on:
branches:
- master
- bso
paths-ignore:
- "docs/**"
pull_request:
paths-ignore:
- "docs/**"

jobs:
test:
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ icon_cache/
queries.txt
/logs

.yarn

npm-debug.log*

# Runtime data
Expand Down Expand Up @@ -44,4 +46,6 @@ tests/**/*.tsbuildinfo
!.yarn/sdks
!.yarn/versions
overallItemsNotCheckedFor.txt
*.diff
*.diff
item/
tmp
9 changes: 7 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"files": {
"maxSize": 10000000,
"ignore": ["node_modules", "dist", "coverage", "profiling", "logs", "icon_cache"],
"include": ["**/*.ts", "**/*.mts", "**/*.json", "**/*.test.ts"]
"include": ["**/*.ts", "**/*.mts", "**/*.json", "**/*.test.ts", "**/*.mdx", "**/*.md", "**/*.mjs", "**/*.cjs"]
},
"linter": {
"enabled": true,
Expand All @@ -19,7 +19,9 @@
"suspicious": {
"noExplicitAny": "warn",
"noAssignInExpressions": "warn",
"noAsyncPromiseExecutor": "off"
"noAsyncPromiseExecutor": "off",
"noConfusingVoidType": "off",
"noFocusedTests": "off"
},
"style": {
"noNonNullAssertion": "off",
Expand All @@ -37,6 +39,9 @@
"noExtraBooleanCast": "warn",
"noBannedTypes": "warn",
"noForEach": "warn"
},
"performance": {
"noAccumulatingSpread": "off"
}
}
},
Expand Down
Loading

0 comments on commit 862a675

Please sign in to comment.