Skip to content

Commit 43987ed

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Harmonize title formatting in `docs/content/doc/development/api-usage.en-us.md` (go-gitea#24529) automate locking closed threads (go-gitea#24525) [skip ci] Updated translations via Crowdin Display warning when user try to rename default branch (go-gitea#24512) Upgrade to Node 20 on CI, enable actions cancellation (go-gitea#24524) Fix incorrectly quoted translation (go-gitea#24514) Fix color for transfer related buttons when having no permission to act (go-gitea#24510) Fix some mistakes when using `ignSignIn` (go-gitea#24415) Remove unused zapx replace statement on go.mod (go-gitea#24515) Don't display creating page button in a mirror wiki repository (go-gitea#24395) Improve template system and panic recovery (go-gitea#24461) Faster git.GetDivergingCommits (go-gitea#24482) Merge setting.InitXXX into one function with options (go-gitea#24389)
2 parents 5c32bab + 78fdbaf commit 43987ed

Some content is hidden

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

72 files changed

+617
-568
lines changed

.drone.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ steps:
3333
- git fetch --tags --force
3434

3535
- name: deps-frontend
36-
image: node:18
36+
image: node:20
3737
pull: always
3838
commands:
3939
- make deps-frontend
@@ -51,7 +51,7 @@ steps:
5151
image: techknowlogick/xgo:go-1.20.x
5252
pull: always
5353
commands:
54-
# Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved
54+
# Upgrade to node 20 once https://github.com/techknowlogick/xgo/issues/163 is resolved
5555
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs
5656
- export PATH=$PATH:$GOPATH/bin
5757
- make release
@@ -161,7 +161,7 @@ steps:
161161
- git fetch --tags --force
162162

163163
- name: deps-frontend
164-
image: node:18
164+
image: node:20
165165
pull: always
166166
commands:
167167
- make deps-frontend
@@ -179,7 +179,7 @@ steps:
179179
image: techknowlogick/xgo:go-1.20.x
180180
pull: always
181181
commands:
182-
# Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved
182+
# Upgrade to node 20 once https://github.com/techknowlogick/xgo/issues/163 is resolved
183183
- curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs
184184
- export PATH=$PATH:$GOPATH/bin
185185
- make release

.github/lock.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/lock.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'Lock Threads'
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *' # Run once a day
6+
workflow_dispatch:
7+
8+
permissions:
9+
issues: write
10+
pull-requests: write
11+
12+
concurrency:
13+
group: lock
14+
15+
jobs:
16+
action:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: dessant/lock-threads@v4
20+
with:
21+
issue-inactive-days: 45

.github/workflows/pull-compliance.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: "Pull: Compliance Tests"
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
59
jobs:
610
lint_basic:
711
runs-on: ubuntu-latest
@@ -79,7 +83,7 @@ jobs:
7983
- name: setup node
8084
uses: actions/setup-node@v3
8185
with:
82-
node-version: 18
86+
node-version: 20
8387
- name: deps-frontend
8488
run: make deps-frontend
8589
- name: lint frontend
@@ -100,7 +104,7 @@ jobs:
100104
- name: setup node
101105
uses: actions/setup-node@v3
102106
with:
103-
node-version: 18
107+
node-version: 20
104108
- name: deps-backend
105109
run: make deps-backend deps-tools
106110
- name: deps-frontend

.github/workflows/pull-compliance_docs.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@ on:
66
- "docs/**"
77
- "*.md"
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
compliance-docs:
1115
runs-on: ubuntu-latest
1216
steps:
1317
- name: checkout
1418
uses: actions/checkout@v3
1519
- name: setup node
16-
uses: actions/setup-node@v2
20+
uses: actions/setup-node@v3
1721
with:
18-
node-version: 18
22+
node-version: 20
1923
- name: install dependencies
2024
run: make deps-frontend
2125
- name: lint markdown

.github/workflows/pull-db_test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: "Pull: Database Tests"
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
59
jobs:
610
# PostgreSQL Tests
711
db_pgsql_test:

.github/workflows/pull-docker_dryrun.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: "Pull: Docker Dry Run"
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
59
jobs:
610
docker_dryrun:
711
runs-on: ubuntu-latest

.github/workflows/pull-e2e.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: "Pull: E2E Tests"
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
7+
cancel-in-progress: true
8+
59
jobs:
610
e2e_tests:
711
runs-on: ubuntu-latest
@@ -15,7 +19,7 @@ jobs:
1519
- name: setup node
1620
uses: actions/setup-node@v3
1721
with:
18-
node-version: 18
22+
node-version: 20
1923
- name: build
2024
run: make deps-frontend frontend deps-backend
2125
- name: Install playwright browsers

cmd/actions.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ func runGenerateActionsRunnerToken(c *cli.Context) error {
4242
ctx, cancel := installSignals()
4343
defer cancel()
4444

45-
setting.InitProviderFromExistingFile()
46-
setting.LoadCommonSettings()
45+
setting.Init(&setting.Options{})
4746

4847
scope := c.String("scope")
4948

cmd/cmd.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ func confirm() (bool, error) {
5757
}
5858

5959
func initDB(ctx context.Context) error {
60-
setting.InitProviderFromExistingFile()
61-
setting.LoadCommonSettings()
60+
setting.Init(&setting.Options{})
6261
setting.LoadDBSetting()
6362
setting.InitSQLLog(false)
6463

0 commit comments

Comments
 (0)