Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Arodab committed Oct 9, 2024
2 parents 5e70f5b + 40efd0a commit 97ad586
Show file tree
Hide file tree
Showing 640 changed files with 42,950 additions and 13,151 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
11 changes: 2 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,10 @@ AUTHORS text
*.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 binary
*.woff2 binary
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
31 changes: 0 additions & 31 deletions .github/workflows/spreadsheets.yml

This file was deleted.

10 changes: 6 additions & 4 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 All @@ -20,7 +24,7 @@ jobs:
steps:
- name: Checkout Project
uses: actions/checkout@v4
- run: corepack enable && corepack install
- run: corepack enable && corepack install
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v4
with:
Expand All @@ -32,15 +36,13 @@ jobs:
path: node_modules
key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/yarn.lock') }}
- name: Install Dependencies
run: yarn --immutable
run: yarn remove zlib-sync && yarn install
- name: Copy Configuration
run: |
pushd src &&
cp config.example.ts config.ts &&
popd && cp .env.test .env
- name: Generate Prisma Clients
run: yarn gen
- name: Build
run: yarn build:tsc
- name: Test
run: yarn test:ci:unit
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 @@ -43,4 +45,6 @@ tests/**/*.tsbuildinfo
!.yarn/releases
!.yarn/sdks
!.yarn/versions
item/
item/

tmp
7 changes: 5 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
},
"files": {
"maxSize": 10000000,
"ignore": ["node_modules", "dist", "coverage", "profiling", "logs", "icon_cache"],
"include": ["**/*.ts", "**/*.mts", "**/*.json", "**/*.test.ts"]
"ignore": ["node_modules", "dist", "coverage", "profiling", "logs", "icon_cache", ".astro", ".yarn"],
"include": ["**/*.ts", "**/*.mts", "**/*.json", "**/*.test.ts", "**/*.mdx", "**/*.md", "**/*.mjs", "**/*.cjs"]
},
"vcs": {
"defaultBranch": "master"
},
"linter": {
"enabled": true,
Expand Down
Loading

0 comments on commit 97ad586

Please sign in to comment.