Skip to content

Commit 25713c6

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Add JSON linting (go-gitea#36192) Bump setup-node to v6, re-enable cache (go-gitea#36207) [skip ci] Updated translations via Crowdin Update chroma to v2.21.1 (go-gitea#36201) Disable dependabot automatic labels (go-gitea#36203) Bump astral-sh/setup-uv from 6 to 7 (go-gitea#36198) Front port changelog (go-gitea#36193) Bump dev-hanz-ops/install-gh-cli-action from 0.1.0 to 0.2.1 (go-gitea#36195) Bump aws-actions/configure-aws-credentials from 4 to 5 (go-gitea#36196) Bump docker/build-push-action from 5 to 6 (go-gitea#36197) Enable dependabot for actions (go-gitea#36191) Bump alpine to 3.23 (go-gitea#36185) Use gitRepo as parameter instead of repopath when invoking sign functions (go-gitea#36162) Fix bug when creating pull request (go-gitea#36166) Bump golangci-lint to 2.7.2, enable modernize stringsbuilder (go-gitea#36180) Use a migration test instead of a wrong test which populated the meta test repositories and fix a migration bug (go-gitea#36160) Update JS deps and eslint enhancements (go-gitea#36147) Add git.DIFF_RENAME_SIMILARITY_THRESHOLD option (go-gitea#36164) Fix OrgAssignment opts (go-gitea#36174) # Conflicts: # models/user/user.go
2 parents 3e5054b + b915e69 commit 25713c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1975
-1048
lines changed

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: github-actions
5+
labels: []
6+
directory: /
7+
schedule:
8+
interval: daily
9+
cooldown:
10+
default-days: 5

‎.github/workflows/files-changed.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ on:
1919
value: ${{ jobs.detect.outputs.swagger }}
2020
yaml:
2121
value: ${{ jobs.detect.outputs.yaml }}
22+
json:
23+
value: ${{ jobs.detect.outputs.json }}
2224

2325
jobs:
2426
detect:
@@ -35,6 +37,7 @@ jobs:
3537
docker: ${{ steps.changes.outputs.docker }}
3638
swagger: ${{ steps.changes.outputs.swagger }}
3739
yaml: ${{ steps.changes.outputs.yaml }}
40+
json: ${{ steps.changes.outputs.json }}
3841
steps:
3942
- uses: actions/checkout@v6
4043
- uses: dorny/paths-filter@v3
@@ -100,3 +103,6 @@ jobs:
100103
- "**/*.yaml"
101104
- ".yamllint.yaml"
102105
- "pyproject.toml"
106+
107+
json:
108+
- "**/*.json"

‎.github/workflows/pull-compliance.yml‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ jobs:
3838
contents: read
3939
steps:
4040
- uses: actions/checkout@v6
41-
- uses: astral-sh/setup-uv@v6
41+
- uses: astral-sh/setup-uv@v7
4242
- run: uv python install 3.12
4343
- uses: pnpm/action-setup@v4
44-
- uses: actions/setup-node@v5
44+
- uses: actions/setup-node@v6
4545
with:
4646
node-version: 24
47+
cache: pnpm
48+
cache-dependency-path: pnpm-lock.yaml
4749
- run: make deps-py
4850
- run: make deps-frontend
4951
- run: make lint-templates
@@ -56,11 +58,26 @@ jobs:
5658
contents: read
5759
steps:
5860
- uses: actions/checkout@v6
59-
- uses: astral-sh/setup-uv@v6
61+
- uses: astral-sh/setup-uv@v7
6062
- run: uv python install 3.12
6163
- run: make deps-py
6264
- run: make lint-yaml
6365

66+
lint-json:
67+
if: needs.files-changed.outputs.json == 'true'
68+
needs: files-changed
69+
runs-on: ubuntu-latest
70+
permissions:
71+
contents: read
72+
steps:
73+
- uses: actions/checkout@v6
74+
- uses: pnpm/action-setup@v4
75+
- uses: actions/setup-node@v5
76+
with:
77+
node-version: 24
78+
- run: make deps-frontend
79+
- run: make lint-json
80+
6481
lint-swagger:
6582
if: needs.files-changed.outputs.swagger == 'true'
6683
needs: files-changed
@@ -70,9 +87,11 @@ jobs:
7087
steps:
7188
- uses: actions/checkout@v6
7289
- uses: pnpm/action-setup@v4
73-
- uses: actions/setup-node@v5
90+
- uses: actions/setup-node@v6
7491
with:
7592
node-version: 24
93+
cache: pnpm
94+
cache-dependency-path: pnpm-lock.yaml
7695
- run: make deps-frontend
7796
- run: make lint-swagger
7897

@@ -150,9 +169,11 @@ jobs:
150169
steps:
151170
- uses: actions/checkout@v6
152171
- uses: pnpm/action-setup@v4
153-
- uses: actions/setup-node@v5
172+
- uses: actions/setup-node@v6
154173
with:
155174
node-version: 24
175+
cache: pnpm
176+
cache-dependency-path: pnpm-lock.yaml
156177
- run: make deps-frontend
157178
- run: make lint-frontend
158179
- run: make checks-frontend
@@ -202,9 +223,11 @@ jobs:
202223
steps:
203224
- uses: actions/checkout@v6
204225
- uses: pnpm/action-setup@v4
205-
- uses: actions/setup-node@v5
226+
- uses: actions/setup-node@v6
206227
with:
207228
node-version: 24
229+
cache: pnpm
230+
cache-dependency-path: pnpm-lock.yaml
208231
- run: make deps-frontend
209232
- run: make lint-md
210233

‎.github/workflows/pull-docker-dryrun.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
- uses: actions/checkout@v6
2424
- uses: docker/setup-buildx-action@v3
2525
- name: Build regular container image
26-
uses: docker/build-push-action@v5
26+
uses: docker/build-push-action@v6
2727
with:
2828
context: .
2929
push: false
3030
tags: gitea/gitea:linux-amd64
3131
- name: Build rootless container image
32-
uses: docker/build-push-action@v5
32+
uses: docker/build-push-action@v6
3333
with:
3434
context: .
3535
push: false

‎.github/workflows/release-nightly.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ jobs:
2323
go-version-file: go.mod
2424
check-latest: true
2525
- uses: pnpm/action-setup@v4
26-
- uses: actions/setup-node@v5
26+
- uses: actions/setup-node@v6
2727
with:
2828
node-version: 24
29+
cache: pnpm
30+
cache-dependency-path: pnpm-lock.yaml
2931
- run: make deps-frontend deps-backend
3032
# xgo build
3133
- run: make release
@@ -50,7 +52,7 @@ jobs:
5052
echo "Cleaned name is ${REF_NAME}"
5153
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
5254
- name: configure aws
53-
uses: aws-actions/configure-aws-credentials@v4
55+
uses: aws-actions/configure-aws-credentials@v5
5456
with:
5557
aws-region: ${{ secrets.AWS_REGION }}
5658
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -111,15 +113,15 @@ jobs:
111113
username: ${{ github.repository_owner }}
112114
password: ${{ secrets.GITHUB_TOKEN }}
113115
- name: build regular docker image
114-
uses: docker/build-push-action@v5
116+
uses: docker/build-push-action@v6
115117
with:
116118
context: .
117119
platforms: linux/amd64,linux/arm64,linux/riscv64
118120
push: true
119121
tags: ${{ steps.meta.outputs.tags }}
120122
annotations: ${{ steps.meta.outputs.annotations }}
121123
- name: build rootless docker image
122-
uses: docker/build-push-action@v5
124+
uses: docker/build-push-action@v6
123125
with:
124126
context: .
125127
platforms: linux/amd64,linux/arm64,linux/riscv64

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ jobs:
2424
go-version-file: go.mod
2525
check-latest: true
2626
- uses: pnpm/action-setup@v4
27-
- uses: actions/setup-node@v5
27+
- uses: actions/setup-node@v6
2828
with:
2929
node-version: 24
30+
cache: pnpm
31+
cache-dependency-path: pnpm-lock.yaml
3032
- run: make deps-frontend deps-backend
3133
# xgo build
3234
- run: make release
@@ -51,7 +53,7 @@ jobs:
5153
echo "Cleaned name is ${REF_NAME}"
5254
echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
5355
- name: configure aws
54-
uses: aws-actions/configure-aws-credentials@v4
56+
uses: aws-actions/configure-aws-credentials@v5
5557
with:
5658
aws-region: ${{ secrets.AWS_REGION }}
5759
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -60,7 +62,7 @@ jobs:
6062
run: |
6163
aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
6264
- name: Install GH CLI
63-
uses: dev-hanz-ops/install-gh-cli-action@v0.1.0
65+
uses: dev-hanz-ops/install-gh-cli-action@v0.2.1
6466
with:
6567
gh-cli-version: 2.39.1
6668
- name: create github release
@@ -121,15 +123,15 @@ jobs:
121123
username: ${{ github.repository_owner }}
122124
password: ${{ secrets.GITHUB_TOKEN }}
123125
- name: build regular container image
124-
uses: docker/build-push-action@v5
126+
uses: docker/build-push-action@v6
125127
with:
126128
context: .
127129
platforms: linux/amd64,linux/arm64,linux/riscv64
128130
push: true
129131
tags: ${{ steps.meta.outputs.tags }}
130132
annotations: ${{ steps.meta.outputs.annotations }}
131133
- name: build rootless container image
132-
uses: docker/build-push-action@v5
134+
uses: docker/build-push-action@v6
133135
with:
134136
context: .
135137
platforms: linux/amd64,linux/arm64,linux/riscv64

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ jobs:
2727
go-version-file: go.mod
2828
check-latest: true
2929
- uses: pnpm/action-setup@v4
30-
- uses: actions/setup-node@v5
30+
- uses: actions/setup-node@v6
3131
with:
3232
node-version: 24
33+
cache: pnpm
34+
cache-dependency-path: pnpm-lock.yaml
3335
- run: make deps-frontend deps-backend
3436
# xgo build
3537
- run: make release
@@ -54,7 +56,7 @@ jobs:
5456
echo "Cleaned name is ${REF_NAME}"
5557
echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
5658
- name: configure aws
57-
uses: aws-actions/configure-aws-credentials@v4
59+
uses: aws-actions/configure-aws-credentials@v5
5860
with:
5961
aws-region: ${{ secrets.AWS_REGION }}
6062
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -63,7 +65,7 @@ jobs:
6365
run: |
6466
aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
6567
- name: Install GH CLI
66-
uses: dev-hanz-ops/install-gh-cli-action@v0.1.0
68+
uses: dev-hanz-ops/install-gh-cli-action@v0.2.1
6769
with:
6870
gh-cli-version: 2.39.1
6971
- name: create github release
@@ -133,15 +135,15 @@ jobs:
133135
username: ${{ github.repository_owner }}
134136
password: ${{ secrets.GITHUB_TOKEN }}
135137
- name: build regular container image
136-
uses: docker/build-push-action@v5
138+
uses: docker/build-push-action@v6
137139
with:
138140
context: .
139141
platforms: linux/amd64,linux/arm64,linux/riscv64
140142
push: true
141143
tags: ${{ steps.meta.outputs.tags }}
142144
annotations: ${{ steps.meta.outputs.annotations }}
143145
- name: build rootless container image
144-
uses: docker/build-push-action@v5
146+
uses: docker/build-push-action@v6
145147
with:
146148
context: .
147149
platforms: linux/amd64,linux/arm64,linux/riscv64

‎.golangci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ linters:
111111
- require-error
112112
usetesting:
113113
os-temp-dir: true
114-
modernize:
115-
disable:
116-
- stringsbuilder
117114
perfsprint:
118115
concat-loop: false
119116
govet:

0 commit comments

Comments
 (0)