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.

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

Release 0.32.0 #289

Merged
merged 21 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
638a202
use husky's way of handling lack of dep in prod
tudddorrr Apr 28, 2024
03036fa
Update docker/build-push-action action to v5
renovate[bot] Apr 28, 2024
7294c0c
Update docker/login-action action to v3
renovate[bot] Apr 28, 2024
32c215c
Update docker/setup-buildx-action action to v3
renovate[bot] Apr 28, 2024
e7151b0
Update docker/setup-qemu-action action to v3
renovate[bot] Apr 28, 2024
901c8ab
Update softprops/action-gh-release action to v2
renovate[bot] Apr 28, 2024
287c648
Merge pull request #281 from TaloDev/renovate/docker-build-push-actio…
tudddorrr Apr 28, 2024
2c94eee
Merge pull request #282 from TaloDev/renovate/docker-login-action-3.x
tudddorrr Apr 28, 2024
e56438b
Merge pull request #283 from TaloDev/renovate/docker-setup-buildx-act…
tudddorrr Apr 28, 2024
e462155
Merge pull request #284 from TaloDev/renovate/docker-setup-qemu-actio…
tudddorrr Apr 28, 2024
2cea6d5
Merge pull request #285 from TaloDev/renovate/softprops-action-gh-rel…
tudddorrr Apr 28, 2024
58bf2e2
Update dependency @types/supertest to v2.0.16
renovate[bot] May 1, 2024
2cec649
make sure non existent key doesn't break everything
tudddorrr May 7, 2024
38e9550
Merge pull request #287 from TaloDev/renovate/supertest-2.x-lockfile
tudddorrr May 19, 2024
c8d1bb5
create more natural looking demo events
tudddorrr May 23, 2024
d7600aa
fix tests
tudddorrr May 24, 2024
b909532
Merge pull request #288 from TaloDev/better-demo-events
tudddorrr May 26, 2024
1e79a82
Update dependency @types/koa-logger to v3.1.5
renovate[bot] May 26, 2024
bc288d9
Merge pull request #286 from TaloDev/renovate/koa-logger-3.x-lockfile
tudddorrr May 28, 2024
6168455
upgrade mikro-orm
tudddorrr May 28, 2024
5b88d57
0.32.0
tudddorrr May 28, 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/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: npm run build

- name: Create GitHub release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: "!contains(github.event.head_commit.message, '--no-release')"
with:
generate_release_notes: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ jobs:
- run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
tags: |
Expand Down
6 changes: 6 additions & 0 deletions .husky/install.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Skip Husky install in production and CI
if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
process.exit(0)
}
const husky = (await import('husky')).default
console.log(husky())
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ COPY package-lock.json .
EXPOSE 80

FROM base AS dev
COPY .husky .husky
RUN npm ci
CMD [ "npm", "run", "watch" ]

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ version: '3.9'

services:
test-db:
image: mysql:8
command: --default-authentication-plugin=mysql_native_password --sql_mode=
image: mysql:8.4
command: --mysql-native-password=ON
environment:
- MYSQL_DATABASE=${DB_NAME}
- MYSQL_ROOT_PASSWORD=${DB_PASS}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.9'
services:
test-db:
image: mysql:8
command: --default-authentication-plugin=mysql_native_password --sql_mode=
command: --mysql-native-password=ON
environment:
- MYSQL_DATABASE=${DB_NAME}
- MYSQL_ROOT_PASSWORD=${DB_PASS}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:

db:
image: mysql:8
command: --default-authentication-plugin=mysql_native_password --sql_mode=
command: --mysql-native-password=ON
environment:
- MYSQL_DATABASE=${DB_NAME}
- MYSQL_ROOT_PASSWORD=${DB_PASS}
Expand Down
91 changes: 44 additions & 47 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "game-services",
"version": "0.31.1",
"version": "0.32.0",
"description": "",
"main": "src/index.ts",
"scripts": {
"watch": "tsnd --respawn src/index.ts",
"build": "npx tsc -p tsconfig.build.json",
"seed": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml exec backend npx ts-node tests/seed.ts",
"dc": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml",
"seed": "npm run dc -- exec backend npx ts-node tests/seed.ts",
"test": "./tests/run-tests.sh",
"up": "npm run dc up --build -d",
"down": "npm run dc down",
"restart": "npm run dc restart backend && npm run logs",
"logs": "npm run dc logs --follow backend",
"up": "npm run dc -- up --build -d",
"down": "npm run dc -- down",
"restart": "npm run dc -- restart backend && npm run logs",
"logs": "npm run dc -- logs backend --follow",
"migration:create": "DB_HOST=127.0.0.1 mikro-orm migration:create",
"migration:up": "DB_HOST=127.0.0.1 mikro-orm migration:up",
"service:create": "hygen service new",
"prepare": "husky || true",
"prepare": "node .husky/install.mjs",
"lint": "eslint src/**/*.ts tests/**/*.ts"
},
"author": "Sleepy Studios",
"license": "MIT",
"devDependencies": {
"@mikro-orm/cli": "^6.2.3",
"@mikro-orm/cli": "^6.2.8",
"@types/koa": "^2.13.5",
"@types/koa-bodyparser": "^4.3.7",
"@types/koa-logger": "^3.1.2",
Expand All @@ -33,7 +33,6 @@
"@typescript-eslint/parser": "^5.40.1",
"@vitest/coverage-v8": "^1.5.2",
"axios-mock-adapter": "^1.22.0",
"casual": "^1.6.2",
"eslint": "^8.26.0",
"hefty": "^1.1.0",
"husky": "^9.0.11",
Expand All @@ -49,17 +48,18 @@
"dependencies": {
"@dinero.js/currencies": "^2.0.0-alpha.14",
"@koa/cors": "^5.0.0",
"@mikro-orm/core": "^6.2.3",
"@mikro-orm/migrations": "^6.2.3",
"@mikro-orm/mysql": "^6.2.3",
"@mikro-orm/reflection": "^6.2.3",
"@mikro-orm/core": "^6.2.8",
"@mikro-orm/migrations": "^6.2.8",
"@mikro-orm/mysql": "^6.2.8",
"@mikro-orm/reflection": "^6.2.8",
"@sendgrid/mail": "^7.6.2",
"@sentry/node": "^7.47.0",
"@sentry/utils": "^7.47.0",
"adm-zip": "^0.5.6",
"axios": "^1.6.8",
"bcrypt": "^5.1.0",
"bullmq": "^3.2.0",
"casual": "^1.6.2",
"date-fns": "^2.28.0",
"dinero.js": "^2.0.0-alpha.14",
"dotenv": "^16.0.0",
Expand Down
Loading