Skip to content

Commit

Permalink
feat: update pnpm to 8 and node to 20
Browse files Browse the repository at this point in the history
  • Loading branch information
zkrising committed Apr 9, 2024
1 parent a438800 commit 142dc59
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm

- name: Install dependencies
Expand All @@ -55,7 +55,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm

- name: Enable SSH Key
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/database-seeds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm

- name: Install dependencies
Expand Down Expand Up @@ -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}}
4 changes: 2 additions & 2 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: pnpm

- name: Install dependencies
Expand Down Expand Up @@ -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}}
4 changes: 2 additions & 2 deletions Dockerfile.bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.bot
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.client
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ghbot
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.seeds
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.server
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
},
"engines": {
"node": "16",
"pnpm": "7"
"pnpm": "8"
}
}
6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"vite": "^3.0.7"
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
}
2 changes: 1 addition & 1 deletion github-bot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
},
"engines": {
"node": "16",
"pnpm": "7"
"pnpm": "8"
}
}
13 changes: 2 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,22 @@
"scripts": {
"start": "docker compose -f docker-compose-dev.yml up --build -d",
"stop": "docker compose -f docker-compose-dev.yml down",


"logs-server": "docker logs tachi-server -f",
"logs-client": "docker logs tachi-client -f",
"logs-seeds": "docker logs tachi-seeds -f",

"test-server": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm test",
"test-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds pnpm --filter ./scripts test",

"enter-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds bash",
"sort-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds node scripts/deterministic-collection-sort.js",
"view-seeds": "xdg-open http://127.0.0.1:3000/utils/seeds",
"load-seeds": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm sync-database-local",

"validate-db": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm validate-database",

"start-docs": "cd docs/ && mkdocs serve",

"raw-start-server": "pnpm --filter ./server start",
"raw-start-client": "pnpm --filter ./client start",
"raw-start-dbs": "redis-server --daemonize yes; sudo systemctl start mongodb.service",

"^^ DEV STUFF IS HERE ^^": "comment",
"vv PROD STUFF YOU WON'T TOUCH vv": "comment",

"build": "pnpm -r build",
"sync-database": "pnpm --filter ./server sync-database",
"start-score-import-worker": "pnpm --filter ./server runscoreworker"
Expand Down Expand Up @@ -77,7 +68,7 @@
}
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
6 changes: 3 additions & 3 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
]
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}
}
4 changes: 2 additions & 2 deletions sieglinde/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"winston": "3.5.1"
},
"engines": {
"node": "16",
"pnpm": "7"
"node": "20",
"pnpm": "8"
}
}

0 comments on commit 142dc59

Please sign in to comment.