Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-07 14:28:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge cirratism

Browse Source
This commit is contained in:
zkldi
2024-04-09 23:27:10 +01:00
parent 73dfd64cd3
commit 0bb76fb338
18 changed files with 2252 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/client.yml
+4 -4
View File
@@ -25,11 +25,11 @@ jobs:
- uses: pnpm/action-setup@v2
with:
version: 7.20.0
version: 8.15.6
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm
- name: Install dependencies
@@ -51,11 +51,11 @@ jobs:
- uses: pnpm/action-setup@v2
with:
version: 7.20.0
version: 8.15.6
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm
- name: Enable SSH Key
.github/workflows/common.yml
+2 -2
View File
@@ -22,11 +22,11 @@ jobs:
- uses: pnpm/action-setup@v2
with:
version: 7.20.0
version: 8.15.6
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm
- name: Install dependencies
.github/workflows/database-seeds.yml
+3 -3
View File
@@ -24,11 +24,11 @@ jobs:
- uses: pnpm/action-setup@v2
with:
version: 7.20.0
version: 8.15.6
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm
- name: Install dependencies
@@ -56,4 +56,4 @@ jobs:
- name: Deploy updates
run: ssh ci@"$TACHI_HOST" /home/ci/tachi-devops/scripts/deploy_seeds.sh
env:
TACHI_HOST: ${{secrets.TACHI_HOST}}
TACHI_HOST: ${{secrets.TACHI_HOST}}
.github/workflows/server.yml
+3 -3
View File
@@ -25,11 +25,11 @@ jobs:
- uses: pnpm/action-setup@v2
with:
version: 7.20.0
version: 8.15.6
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm
- name: Install dependencies
@@ -110,4 +110,4 @@ jobs:
- name: Deploy updates
run: ssh ci@"$TACHI_HOST" /home/ci/tachi-devops/scripts/deploy_server.sh
env:
TACHI_HOST: ${{secrets.TACHI_HOST}}
TACHI_HOST: ${{secrets.TACHI_HOST}}
Dockerfile.bootstrap
+2 -2
View File
@@ -6,9 +6,9 @@
# I really do not care.
# Want it better? Do it yourself.
FROM node:16 as base
FROM node:20 as base
RUN npm install --silent -g pnpm@7.20.0
RUN npm install --silent -g pnpm@8.15.6
WORKDIR /app
Dockerfile.bot
+2 -2
View File
@@ -1,5 +1,5 @@
FROM node:16-alpine as base
RUN npm install --silent -g pnpm@7.20.0
FROM node:20-alpine as base
RUN npm install --silent -g pnpm@8.15.6
FROM base AS build
WORKDIR /app
Dockerfile.client
+2 -2
View File
@@ -1,6 +1,6 @@
FROM node:16-alpine as base
FROM node:20-alpine as base
RUN npm install --silent -g pnpm@7.20.0
RUN npm install --silent -g pnpm@8.15.6
FROM base AS build
WORKDIR /app
Dockerfile.ghbot
+2 -2
View File
@@ -1,5 +1,5 @@
FROM node:16-alpine as base
RUN npm install --silent -g pnpm@7.20.0
FROM node:20-alpine as base
RUN npm install --silent -g pnpm@8.15.6
FROM base AS build
WORKDIR /app
Dockerfile.seeds
+2 -2
View File
@@ -1,7 +1,7 @@
# no alpine here as we want bash + general nice-to-haves
FROM node:16 as base
FROM node:20 as base
RUN npm install --silent -g pnpm@7.20.0
RUN npm install --silent -g pnpm@8.15.6
FROM base AS build
WORKDIR /app
Dockerfile.server
+2 -2
View File
@@ -3,11 +3,11 @@
# does need to boot. You should consider using docker-compose for this.
# base image
FROM node:16-alpine as base
FROM node:20-alpine as base
ARG COMMIT_HASH
ENV COMMIT_HASH=${COMMIT_HASH}
RUN npm install --silent -g pnpm@7.20.0
RUN npm install --silent -g pnpm@8.15.6
RUN apk add --no-cache git curl
# install dependencies
bot/package.json
+2 -2
View File
@@ -46,7 +46,7 @@
"winston": "3.5.1"
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
client/package.json
+3 -3
View File
@@ -90,7 +90,7 @@
"vite": "^3.0.7"
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
}
database-seeds/scripts/package.json
+1 -1
View File
@@ -17,7 +17,7 @@
"dependencies": {
"@types/node": "18.11.18",
"@types/lodash.get": "^4.4.7",
"better-sqlite3": "^7.5.0",
"better-sqlite3": "9.4.5",
"bms-table-loader": "2.0.0",
"chalk": "4",
"commander": "^8.2.0",
github-bot/package.json
+2 -2
View File
@@ -22,7 +22,7 @@
"typescript": "4.9.4"
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
package.json
+2 -2
View File
@@ -70,7 +70,7 @@
}
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
pnpm-lock.yaml
Generated
+2213 -2053
View File
File diff suppressed because it is too large Load Diff
server/package.json
+3 -3
View File
@@ -119,7 +119,7 @@
]
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
}
sieglinde/package.json
+2 -2
View File
@@ -21,7 +21,7 @@
"winston": "3.5.1"
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}