Skip to content

Commit 54d5771

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix package webhook (go-gitea#27839) Add user secrets API integration tests (go-gitea#27832) Fix wrong relative path on obtain token from command line (go-gitea#27850) doc: actions/act-runner: document obtaining a runner registration token from gitea CLI (go-gitea#27845) Fix/upload artifact error windows (go-gitea#27802) Always use whole user name as link (go-gitea#27815) Fix display member unit in the menu bar if there are no hidden members in public org (go-gitea#27795) Add Index to pull_auto_merge.doer_id (go-gitea#27811) Bump workflows in github actions (go-gitea#27836) Allow pull requests Manually Merged option to be used by non-admins (go-gitea#27780)
2 parents 5506aae + 16d15ce commit 54d5771

File tree

33 files changed

+284
-65
lines changed

33 files changed

+284
-65
lines changed

‎.github/workflows/cron-licenses.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- run: make generate-license generate-gitignore
1919
timeout-minutes: 40
2020
- name: push translations to repo
21-
uses: appleboy/[email protected].2
21+
uses: appleboy/[email protected].3
2222
with:
2323
author_email: "[email protected]"
2424
author_name: GiteaBot

‎.github/workflows/cron-translations.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: update locales
2323
run: ./build/update-locales.sh
2424
- name: push translations to repo
25-
uses: appleboy/[email protected].2
25+
uses: appleboy/[email protected].3
2626
with:
2727
author_email: "[email protected]"
2828
author_name: GiteaBot

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
steps:
6060
- uses: actions/checkout@v4
61-
- uses: actions/setup-node@v3
61+
- uses: actions/setup-node@v4
6262
with:
6363
node-version: 20
6464
- run: make deps-frontend
@@ -115,7 +115,7 @@ jobs:
115115
runs-on: ubuntu-latest
116116
steps:
117117
- uses: actions/checkout@v4
118-
- uses: actions/setup-node@v3
118+
- uses: actions/setup-node@v4
119119
with:
120120
node-version: 20
121121
- run: make deps-frontend
@@ -162,7 +162,7 @@ jobs:
162162
runs-on: ubuntu-latest
163163
steps:
164164
- uses: actions/checkout@v4
165-
- uses: actions/setup-node@v3
165+
- uses: actions/setup-node@v4
166166
with:
167167
node-version: 20
168168
- run: make deps-frontend

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
needs: files-changed
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: docker/setup-buildx-action@v2
20-
- uses: docker/build-push-action@v4
19+
- uses: docker/setup-buildx-action@v3
20+
- uses: docker/build-push-action@v5
2121
with:
2222
push: false
2323
tags: gitea/gitea:linux-amd64
@@ -27,8 +27,8 @@ jobs:
2727
needs: files-changed
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: docker/setup-buildx-action@v2
31-
- uses: docker/build-push-action@v4
30+
- uses: docker/setup-buildx-action@v3
31+
- uses: docker/build-push-action@v5
3232
with:
3333
push: false
3434
file: Dockerfile.rootless

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
go-version-file: go.mod
2323
check-latest: true
24-
- uses: actions/setup-node@v3
24+
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
2727
- run: make deps-frontend frontend deps-backend

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: release-nightly
22

33
on:
44
push:
5-
branches: [ main, release/v* ]
5+
branches: [main, release/v*]
66

77
concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
go-version-file: go.mod
2424
check-latest: true
25-
- uses: actions/setup-node@v3
25+
- uses: actions/setup-node@v4
2626
with:
2727
node-version: 20
2828
- run: make deps-frontend deps-backend
@@ -32,7 +32,7 @@ jobs:
3232
TAGS: bindata sqlite sqlite_unlock_notify
3333
- name: import gpg key
3434
id: import_gpg
35-
uses: crazy-max/ghaction-import-gpg@v5
35+
uses: crazy-max/ghaction-import-gpg@v6
3636
with:
3737
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
3838
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
@@ -68,8 +68,8 @@ jobs:
6868
with:
6969
go-version-file: go.mod
7070
check-latest: true
71-
- uses: docker/setup-qemu-action@v2
72-
- uses: docker/setup-buildx-action@v2
71+
- uses: docker/setup-qemu-action@v3
72+
- uses: docker/setup-buildx-action@v3
7373
- name: Get cleaned branch name
7474
id: clean_name
7575
run: |
@@ -81,14 +81,14 @@ jobs:
8181
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
8282
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
8383
- name: Login to Docker Hub
84-
uses: docker/login-action@v2
84+
uses: docker/login-action@v3
8585
with:
8686
username: ${{ secrets.DOCKERHUB_USERNAME }}
8787
password: ${{ secrets.DOCKERHUB_TOKEN }}
8888
- name: fetch go modules
8989
run: make vendor
9090
- name: build rootful docker image
91-
uses: docker/build-push-action@v4
91+
uses: docker/build-push-action@v5
9292
with:
9393
context: .
9494
platforms: linux/amd64,linux/arm64
@@ -105,8 +105,8 @@ jobs:
105105
with:
106106
go-version-file: go.mod
107107
check-latest: true
108-
- uses: docker/setup-qemu-action@v2
109-
- uses: docker/setup-buildx-action@v2
108+
- uses: docker/setup-qemu-action@v3
109+
- uses: docker/setup-buildx-action@v3
110110
- name: Get cleaned branch name
111111
id: clean_name
112112
run: |
@@ -118,14 +118,14 @@ jobs:
118118
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
119119
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
120120
- name: Login to Docker Hub
121-
uses: docker/login-action@v2
121+
uses: docker/login-action@v3
122122
with:
123123
username: ${{ secrets.DOCKERHUB_USERNAME }}
124124
password: ${{ secrets.DOCKERHUB_TOKEN }}
125125
- name: fetch go modules
126126
run: make vendor
127127
- name: build rootless docker image
128-
uses: docker/build-push-action@v4
128+
uses: docker/build-push-action@v5
129129
with:
130130
context: .
131131
platforms: linux/amd64,linux/arm64

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: release-tag-rc
33
on:
44
push:
55
tags:
6-
- 'v1*-rc*'
6+
- "v1*-rc*"
77

88
concurrency:
99
group: ${{ github.workflow }}-${{ github.ref }}
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
go-version-file: go.mod
2323
check-latest: true
24-
- uses: actions/setup-node@v3
24+
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
2727
- run: make deps-frontend deps-backend
@@ -31,7 +31,7 @@ jobs:
3131
TAGS: bindata sqlite sqlite_unlock_notify
3232
- name: import gpg key
3333
id: import_gpg
34-
uses: crazy-max/ghaction-import-gpg@v5
34+
uses: crazy-max/ghaction-import-gpg@v6
3535
with:
3636
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
3737
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
@@ -68,8 +68,8 @@ jobs:
6868
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
6969
# fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
7070
- run: git fetch --unshallow --quiet --tags --force
71-
- uses: docker/setup-qemu-action@v2
72-
- uses: docker/setup-buildx-action@v2
71+
- uses: docker/setup-qemu-action@v3
72+
- uses: docker/setup-buildx-action@v3
7373
- uses: docker/metadata-action@v5
7474
id: meta
7575
with:
@@ -78,12 +78,12 @@ jobs:
7878
tags: |
7979
type=semver,pattern={{version}}
8080
- name: Login to Docker Hub
81-
uses: docker/login-action@v2
81+
uses: docker/login-action@v3
8282
with:
8383
username: ${{ secrets.DOCKERHUB_USERNAME }}
8484
password: ${{ secrets.DOCKERHUB_TOKEN }}
8585
- name: build rootful docker image
86-
uses: docker/build-push-action@v4
86+
uses: docker/build-push-action@v5
8787
with:
8888
context: .
8989
platforms: linux/amd64,linux/arm64
@@ -97,8 +97,8 @@ jobs:
9797
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
9898
# fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
9999
- run: git fetch --unshallow --quiet --tags --force
100-
- uses: docker/setup-qemu-action@v2
101-
- uses: docker/setup-buildx-action@v2
100+
- uses: docker/setup-qemu-action@v3
101+
- uses: docker/setup-buildx-action@v3
102102
- uses: docker/metadata-action@v5
103103
id: meta
104104
with:
@@ -110,12 +110,12 @@ jobs:
110110
tags: |
111111
type=semver,pattern={{version}}
112112
- name: Login to Docker Hub
113-
uses: docker/login-action@v2
113+
uses: docker/login-action@v3
114114
with:
115115
username: ${{ secrets.DOCKERHUB_USERNAME }}
116116
password: ${{ secrets.DOCKERHUB_TOKEN }}
117117
- name: build rootless docker image
118-
uses: docker/build-push-action@v4
118+
uses: docker/build-push-action@v5
119119
with:
120120
context: .
121121
platforms: linux/amd64,linux/arm64

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: release-tag-version
33
on:
44
push:
55
tags:
6-
- 'v1.*'
7-
- '!v1*-rc*'
8-
- '!v1*-dev'
6+
- "v1.*"
7+
- "!v1*-rc*"
8+
- "!v1*-dev"
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
go-version-file: go.mod
2525
check-latest: true
26-
- uses: actions/setup-node@v3
26+
- uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
2929
- run: make deps-frontend deps-backend
@@ -33,7 +33,7 @@ jobs:
3333
TAGS: bindata sqlite sqlite_unlock_notify
3434
- name: import gpg key
3535
id: import_gpg
36-
uses: crazy-max/ghaction-import-gpg@v5
36+
uses: crazy-max/ghaction-import-gpg@v6
3737
with:
3838
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
3939
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
@@ -70,8 +70,8 @@ jobs:
7070
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
7171
# fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
7272
- run: git fetch --unshallow --quiet --tags --force
73-
- uses: docker/setup-qemu-action@v2
74-
- uses: docker/setup-buildx-action@v2
73+
- uses: docker/setup-qemu-action@v3
74+
- uses: docker/setup-buildx-action@v3
7575
- uses: docker/metadata-action@v5
7676
id: meta
7777
with:
@@ -87,12 +87,12 @@ jobs:
8787
type=semver,pattern={{major}}.{{minor}}
8888
type=semver,pattern={{version}}
8989
- name: Login to Docker Hub
90-
uses: docker/login-action@v2
90+
uses: docker/login-action@v3
9191
with:
9292
username: ${{ secrets.DOCKERHUB_USERNAME }}
9393
password: ${{ secrets.DOCKERHUB_TOKEN }}
9494
- name: build rootful docker image
95-
uses: docker/build-push-action@v4
95+
uses: docker/build-push-action@v5
9696
with:
9797
context: .
9898
platforms: linux/amd64,linux/arm64
@@ -106,8 +106,8 @@ jobs:
106106
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
107107
# fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
108108
- run: git fetch --unshallow --quiet --tags --force
109-
- uses: docker/setup-qemu-action@v2
110-
- uses: docker/setup-buildx-action@v2
109+
- uses: docker/setup-qemu-action@v3
110+
- uses: docker/setup-buildx-action@v3
111111
- uses: docker/metadata-action@v5
112112
id: meta
113113
with:
@@ -126,12 +126,12 @@ jobs:
126126
type=semver,pattern={{major}}.{{minor}}
127127
type=semver,pattern={{version}}
128128
- name: Login to Docker Hub
129-
uses: docker/login-action@v2
129+
uses: docker/login-action@v3
130130
with:
131131
username: ${{ secrets.DOCKERHUB_USERNAME }}
132132
password: ${{ secrets.DOCKERHUB_TOKEN }}
133133
- name: build rootless docker image
134-
uses: docker/build-push-action@v4
134+
uses: docker/build-push-action@v5
135135
with:
136136
context: .
137137
platforms: linux/amd64,linux/arm64

‎docs/content/usage/actions/act-runner.en-us.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ If you cannot see the settings page, please make sure that you have the right pe
114114

115115
The format of the registration token is a random string `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`.
116116

117+
A registration token can also be obtained from the gitea [command-line interface](../../administration/command-line.en-us.md#actions-generate-runner-token):
118+
119+
```
120+
gitea --config /etc/gitea/app.ini actions generate-runner-token
121+
```
122+
117123
### Register the runner
118124

119125
The act runner can be registered by running the following command:

‎docs/content/usage/actions/act-runner.zh-cn.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ Runner级别决定了从哪里获取注册令牌。
113113

114114
注册令牌的格式是一个随机字符串 `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`。
115115

116+
注册令牌也可以通过 Gitea 的 [命令行](../../administration/command-line.en-us.md#actions-generate-runner-token) 获得:
117+
116118
### 注册Runner
117119

118120
可以通过运行以下命令来注册Act Runner：

0 commit comments

Comments
 (0)