Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker #5987

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Fix docker #5987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
352ec13
Fix
gc Aug 6, 2024
9263071
Test improvements
gc Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Run Integration Tests
run: docker-compose up --build --abort-on-container-exit
run: docker compose up --build --abort-on-container-exit --remove-orphans && docker compose down --volumes --remove-orphans
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@napi-rs/canvas": "^0.1.53",
"@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#2813f25327093fcf2cb12bee7d4c85ce629069a0",
"@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed",
"@prisma/client": "^5.17.0",
"@sapphire/ratelimits": "^2.4.9",
"@sapphire/snowflake": "^3.5.3",
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/redis.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test('Should add patron badge', async () => {
const user = await createTestUser();
expect(user.user.badges).not.includes(BadgesEnum.Patron);
const _redis = makeSender();
_redis.publish({
await _redis.publish({
type: 'patron_tier_change',
discord_ids: [user.id],
new_tier: 1,
Expand All @@ -31,7 +31,7 @@ test('Should remove patron badge', async () => {
const user = await createTestUser(undefined, { badges: [BadgesEnum.Patron] });
expect(user.user.badges).includes(BadgesEnum.Patron);
const _redis = makeSender();
_redis.publish({
await _redis.publish({
type: 'patron_tier_change',
discord_ids: [user.id],
new_tier: 0,
Expand All @@ -52,7 +52,7 @@ test('Should add to cache', async () => {
}))
});
const _redis = makeSender();
_redis.publish({
await _redis.publish({
type: 'patron_tier_change',
discord_ids: users.map(u => u.id),
new_tier: 5,
Expand All @@ -76,7 +76,7 @@ test('Should remove from cache', async () => {
}))
});
const _redis = makeSender();
_redis.publish({
await _redis.publish({
type: 'patron_tier_change',
discord_ids: users.map(u => u.id),
new_tier: 0,
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,9 +646,9 @@ __metadata:
languageName: node
linkType: hard

"@oldschoolgg/toolkit@git+https://github.com/oldschoolgg/toolkit.git#2813f25327093fcf2cb12bee7d4c85ce629069a0":
"@oldschoolgg/toolkit@git+https://github.com/oldschoolgg/toolkit.git#cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed":
version: 0.0.24
resolution: "@oldschoolgg/toolkit@https://github.com/oldschoolgg/toolkit.git#commit=2813f25327093fcf2cb12bee7d4c85ce629069a0"
resolution: "@oldschoolgg/toolkit@https://github.com/oldschoolgg/toolkit.git#commit=cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed"
dependencies:
decimal.js: "npm:^10.4.3"
deep-object-diff: "npm:^1.1.9"
Expand All @@ -664,7 +664,7 @@ __metadata:
peerDependencies:
discord.js: ^14.15.3
oldschooljs: ^2.5.9
checksum: 10c0/c83f2188e18ac1e7d79edd9ab06b7ab0f96f8774a404a26fd766d22606bd65a8def0c0a74d0f681c5bde0d7b5b5bbb16f829e751b4e75f6821a1baf5c62b2580
checksum: 10c0/42eaec1c99c671adab7b56ca7e11d37bf5a0e07d0f0da0a892cdf477a78c061ea131a43b1c578d09f1c6b02e05d1ce47db9586ad9a8de62679cc492c847c3fca
languageName: node
linkType: hard

Expand Down Expand Up @@ -4122,7 +4122,7 @@ __metadata:
dependencies:
"@biomejs/biome": "npm:^1.8.3"
"@napi-rs/canvas": "npm:^0.1.53"
"@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#2813f25327093fcf2cb12bee7d4c85ce629069a0"
"@oldschoolgg/toolkit": "git+https://github.com/oldschoolgg/toolkit.git#cd7c6865229ca7dc4a66b3816586f2d3f4a4fbed"
"@prisma/client": "npm:^5.17.0"
"@sapphire/ratelimits": "npm:^2.4.9"
"@sapphire/snowflake": "npm:^3.5.3"
Expand Down