Skip to content

Commit 4937f49

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Switch to pnpm (go-gitea#35274) Switch `bitnami` images to `bitnamilegacy` on CI (go-gitea#35402) Upgrade dependencies (go-gitea#35384) [skip ci] Updated translations via Crowdin # Conflicts: # package-lock.json
2 parents fb54d91 + 361e59f commit 4937f49

34 files changed

+13559
-14762
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ cpu.out
6565
/yarn.lock
6666
/yarn-error.log
6767
/npm-debug.log*
68+
/pnpm-debug.log*
6869
/public/assets/js
6970
/public/assets/css
7071
/public/assets/fonts

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ modifies/dependencies:
5959
- changed-files:
6060
- any-glob-to-any-file:
6161
- "package.json"
62-
- "package-lock.json"
62+
- "pnpm-lock.yaml"
6363
- "pyproject.toml"
6464
- "uv.lock"
6565
- "go.mod"

.github/workflows/files-changed.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- "tools/*.ts"
5959
- "assets/emoji.json"
6060
- "package.json"
61-
- "package-lock.json"
61+
- "pnpm-lock.yaml"
6262
- "Makefile"
6363
- ".eslintrc.cjs"
6464
- ".npmrc"
@@ -67,7 +67,7 @@ jobs:
6767
- "**/*.md"
6868
- ".markdownlint.yaml"
6969
- "package.json"
70-
- "package-lock.json"
70+
- "pnpm-lock.yaml"
7171
7272
actions:
7373
- ".github/workflows/*"
@@ -90,7 +90,7 @@ jobs:
9090
- "templates/swagger/v1_input.json"
9191
- "Makefile"
9292
- "package.json"
93-
- "package-lock.json"
93+
- "pnpm-lock.yaml"
9494
- ".spectral.yaml"
9595
9696
yaml:

.github/workflows/pull-compliance.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ jobs:
3434
- uses: actions/checkout@v4
3535
- uses: astral-sh/setup-uv@v6
3636
- run: uv python install 3.12
37+
- uses: pnpm/action-setup@v4
3738
- uses: actions/setup-node@v4
3839
with:
3940
node-version: 24
40-
cache: npm
41-
cache-dependency-path: package-lock.json
41+
cache: pnpm
42+
cache-dependency-path: pnpm-lock.yaml
4243
- run: make deps-py
4344
- run: make deps-frontend
4445
- run: make lint-templates
@@ -60,11 +61,12 @@ jobs:
6061
runs-on: ubuntu-latest
6162
steps:
6263
- uses: actions/checkout@v4
64+
- uses: pnpm/action-setup@v4
6365
- uses: actions/setup-node@v4
6466
with:
6567
node-version: 24
66-
cache: npm
67-
cache-dependency-path: package-lock.json
68+
cache: pnpm
69+
cache-dependency-path: pnpm-lock.yaml
6870
- run: make deps-frontend
6971
- run: make lint-swagger
7072

@@ -131,11 +133,12 @@ jobs:
131133
runs-on: ubuntu-latest
132134
steps:
133135
- uses: actions/checkout@v4
136+
- uses: pnpm/action-setup@v4
134137
- uses: actions/setup-node@v4
135138
with:
136139
node-version: 24
137-
cache: npm
138-
cache-dependency-path: package-lock.json
140+
cache: pnpm
141+
cache-dependency-path: pnpm-lock.yaml
139142
- run: make deps-frontend
140143
- run: make lint-frontend
141144
- run: make checks-frontend
@@ -180,11 +183,12 @@ jobs:
180183
runs-on: ubuntu-latest
181184
steps:
182185
- uses: actions/checkout@v4
186+
- uses: pnpm/action-setup@v4
183187
- uses: actions/setup-node@v4
184188
with:
185189
node-version: 24
186-
cache: npm
187-
cache-dependency-path: package-lock.json
190+
cache: pnpm
191+
cache-dependency-path: pnpm-lock.yaml
188192
- run: make deps-frontend
189193
- run: make lint-md
190194

.github/workflows/pull-db-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
minio:
3232
# as github actions doesn't support "entrypoint", we need to use a non-official image
3333
# that has a custom entrypoint set to "minio server /data"
34-
image: bitnami/minio:2023.8.31
34+
image: bitnamilegacy/minio:2023.8.31
3535
env:
3636
MINIO_ROOT_USER: 123456
3737
MINIO_ROOT_PASSWORD: 12345678
@@ -113,7 +113,7 @@ jobs:
113113
ports:
114114
- 6379:6379
115115
minio:
116-
image: bitnami/minio:2021.3.17
116+
image: bitnamilegacy/minio:2021.3.17
117117
env:
118118
MINIO_ACCESS_KEY: 123456
119119
MINIO_SECRET_KEY: 12345678
@@ -155,7 +155,7 @@ jobs:
155155
services:
156156
mysql:
157157
# the bitnami mysql image has more options than the official one, it's easier to customize
158-
image: bitnami/mysql:8.0
158+
image: bitnamilegacy/mysql:8.0
159159
env:
160160
ALLOW_EMPTY_PASSWORD: true
161161
MYSQL_DATABASE: testgitea

.github/workflows/pull-e2e-tests.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ jobs:
2323
with:
2424
go-version-file: go.mod
2525
check-latest: true
26+
- uses: pnpm/action-setup@v4
2627
- uses: actions/setup-node@v4
2728
with:
2829
node-version: 24
29-
cache: npm
30-
cache-dependency-path: package-lock.json
30+
cache: pnpm
31+
cache-dependency-path: pnpm-lock.yaml
3132
- run: make deps-frontend frontend deps-backend
32-
- run: npx playwright install --with-deps
33+
- run: pnpm exec playwright install --with-deps
3334
- run: make test-e2e-sqlite
3435
timeout-minutes: 40
3536
env:

.github/workflows/release-nightly.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ jobs:
2020
with:
2121
go-version-file: go.mod
2222
check-latest: true
23+
- uses: pnpm/action-setup@v4
2324
- uses: actions/setup-node@v4
2425
with:
2526
node-version: 24
26-
cache: npm
27-
cache-dependency-path: package-lock.json
27+
cache: pnpm
28+
cache-dependency-path: pnpm-lock.yaml
2829
- run: make deps-frontend deps-backend
2930
# xgo build
3031
- run: make release

.github/workflows/release-tag-rc.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ jobs:
2121
with:
2222
go-version-file: go.mod
2323
check-latest: true
24+
- uses: pnpm/action-setup@v4
2425
- uses: actions/setup-node@v4
2526
with:
2627
node-version: 24
27-
cache: npm
28-
cache-dependency-path: package-lock.json
28+
cache: pnpm
29+
cache-dependency-path: pnpm-lock.yaml
2930
- run: make deps-frontend deps-backend
3031
# xgo build
3132
- run: make release

.github/workflows/release-tag-version.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ jobs:
2525
with:
2626
go-version-file: go.mod
2727
check-latest: true
28+
- uses: pnpm/action-setup@v4
2829
- uses: actions/setup-node@v4
2930
with:
3031
node-version: 24
31-
cache: npm
32-
cache-dependency-path: package-lock.json
32+
cache: pnpm
33+
cache-dependency-path: pnpm-lock.yaml
3334
- run: make deps-frontend deps-backend
3435
# xgo build
3536
- run: make release

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ cpu.out
7474
/tests/*.ini
7575
/tests/**/*.git/**/*.sample
7676
/node_modules
77+
/tools/node_modules
7778
/.venv
7879
/yarn.lock
7980
/yarn-error.log

0 commit comments

Comments
 (0)