Merge branch 'main' into lunny/support_storage_base_path

go-gitea · Nov 1, 2023 · 8e75711 · 8e75711
2 parents caa4f95 + a4b242a
commit 8e75711
Show file tree

Hide file tree

Showing 50 changed files with 397 additions and 174 deletions.
diff --git a/.github/workflows/cron-licenses.yml b/.github/workflows/cron-licenses.yml
@@ -18,7 +18,7 @@ jobs:
  - run: make generate-license generate-gitignore
  timeout-minutes: 40
  - name: push translations to repo
- uses: appleboy/[email protected].2
+ uses: appleboy/[email protected].3
  with:
  author_email: "[email protected]"
  author_name: GiteaBot

diff --git a/.github/workflows/cron-translations.yml b/.github/workflows/cron-translations.yml
@@ -22,7 +22,7 @@ jobs:
  - name: update locales
  run: ./build/update-locales.sh
  - name: push translations to repo
- uses: appleboy/[email protected].2
+ uses: appleboy/[email protected].3
  with:
  author_email: "[email protected]"
  author_name: GiteaBot

diff --git a/.github/workflows/pull-compliance.yml b/.github/workflows/pull-compliance.yml
@@ -58,7 +58,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v4
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend
@@ -115,7 +115,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v4
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend
@@ -162,7 +162,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v4
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend

diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml
@@ -16,8 +16,8 @@ jobs:
  needs: files-changed
  runs-on: ubuntu-latest
  steps:
- - uses: docker/setup-buildx-action@v2
- - uses: docker/build-push-action@v4
+ - uses: docker/setup-buildx-action@v3
+ - uses: docker/build-push-action@v5
  with:
  push: false
  tags: gitea/gitea:linux-amd64
@@ -27,8 +27,8 @@ jobs:
  needs: files-changed
  runs-on: ubuntu-latest
  steps:
- - uses: docker/setup-buildx-action@v2
- - uses: docker/build-push-action@v4
+ - uses: docker/setup-buildx-action@v3
+ - uses: docker/build-push-action@v5
  with:
  push: false
  file: Dockerfile.rootless

diff --git a/.github/workflows/pull-e2e-tests.yml b/.github/workflows/pull-e2e-tests.yml
@@ -21,7 +21,7 @@ jobs:
  with:
  go-version-file: go.mod
  check-latest: true
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend frontend deps-backend

diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
@@ -2,7 +2,7 @@ name: release-nightly
 
 on:
  push:
- branches: [ main, release/v* ]
+ branches: [main, release/v*]
 
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,7 +22,7 @@ jobs:
  with:
  go-version-file: go.mod
  check-latest: true
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend deps-backend
@@ -32,7 +32,7 @@ jobs:
  TAGS: bindata sqlite sqlite_unlock_notify
  - name: import gpg key
  id: import_gpg
- uses: crazy-max/ghaction-import-gpg@v5
+ uses: crazy-max/ghaction-import-gpg@v6
  with:
  gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
  passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
@@ -68,8 +68,8 @@ jobs:
  with:
  go-version-file: go.mod
  check-latest: true
- - uses: docker/setup-qemu-action@v2
- - uses: docker/setup-buildx-action@v2
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
  - name: Get cleaned branch name
  id: clean_name
  run: |
@@ -81,14 +81,14 @@ jobs:
  REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
  echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
  - name: fetch go modules
  run: make vendor
  - name: build rootful docker image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64
@@ -105,8 +105,8 @@ jobs:
  with:
  go-version-file: go.mod
  check-latest: true
- - uses: docker/setup-qemu-action@v2
- - uses: docker/setup-buildx-action@v2
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
  - name: Get cleaned branch name
  id: clean_name
  run: |
@@ -118,14 +118,14 @@ jobs:
  REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
  echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
  - name: fetch go modules
  run: make vendor
  - name: build rootless docker image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/release-tag-rc.yml b/.github/workflows/release-tag-rc.yml
@@ -3,7 +3,7 @@ name: release-tag-rc
 on:
  push:
  tags:
- - 'v1*-rc*'
+ - "v1*-rc*"
 
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -21,7 +21,7 @@ jobs:
  with:
  go-version-file: go.mod
  check-latest: true
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend deps-backend
@@ -31,7 +31,7 @@ jobs:
  TAGS: bindata sqlite sqlite_unlock_notify
  - name: import gpg key
  id: import_gpg
- uses: crazy-max/ghaction-import-gpg@v5
+ uses: crazy-max/ghaction-import-gpg@v6
  with:
  gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
  passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
@@ -68,8 +68,8 @@ jobs:
  # fetch all commits instead of only the last as some branches are long lived and could have many between versions
  # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
  - run: git fetch --unshallow --quiet --tags --force
- - uses: docker/setup-qemu-action@v2
- - uses: docker/setup-buildx-action@v2
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
  - uses: docker/metadata-action@v5
  id: meta
  with:
@@ -78,12 +78,12 @@ jobs:
  tags: |
  type=semver,pattern={{version}}
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
  - name: build rootful docker image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64
@@ -97,8 +97,8 @@ jobs:
  # fetch all commits instead of only the last as some branches are long lived and could have many between versions
  # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
  - run: git fetch --unshallow --quiet --tags --force
- - uses: docker/setup-qemu-action@v2
- - uses: docker/setup-buildx-action@v2
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
  - uses: docker/metadata-action@v5
  id: meta
  with:
@@ -110,12 +110,12 @@ jobs:
  tags: |
  type=semver,pattern={{version}}
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
  - name: build rootless docker image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64

diff --git a/.github/workflows/release-tag-version.yml b/.github/workflows/release-tag-version.yml
@@ -3,9 +3,9 @@ name: release-tag-version
 on:
  push:
  tags:
- - 'v1.*'
- - '!v1*-rc*'
- - '!v1*-dev'
+ - "v1.*"
+ - "!v1*-rc*"
+ - "!v1*-dev"
 
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,7 +23,7 @@ jobs:
  with:
  go-version-file: go.mod
  check-latest: true
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
  with:
  node-version: 20
  - run: make deps-frontend deps-backend
@@ -33,7 +33,7 @@ jobs:
  TAGS: bindata sqlite sqlite_unlock_notify
  - name: import gpg key
  id: import_gpg
- uses: crazy-max/ghaction-import-gpg@v5
+ uses: crazy-max/ghaction-import-gpg@v6
  with:
  gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
  passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
@@ -70,8 +70,8 @@ jobs:
  # fetch all commits instead of only the last as some branches are long lived and could have many between versions
  # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
  - run: git fetch --unshallow --quiet --tags --force
- - uses: docker/setup-qemu-action@v2
- - uses: docker/setup-buildx-action@v2
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
  - uses: docker/metadata-action@v5
  id: meta
  with:
@@ -87,12 +87,12 @@ jobs:
  type=semver,pattern={{major}}.{{minor}}
  type=semver,pattern={{version}}
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
  - name: build rootful docker image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64
@@ -106,8 +106,8 @@ jobs:
  # fetch all commits instead of only the last as some branches are long lived and could have many between versions
  # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
  - run: git fetch --unshallow --quiet --tags --force
- - uses: docker/setup-qemu-action@v2
- - uses: docker/setup-buildx-action@v2
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
  - uses: docker/metadata-action@v5
  id: meta
  with:
@@ -126,12 +126,12 @@ jobs:
  type=semver,pattern={{major}}.{{minor}}
  type=semver,pattern={{version}}
  - name: Login to Docker Hub
- uses: docker/login-action@v2
+ uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
  - name: build rootless docker image
- uses: docker/build-push-action@v4
+ uses: docker/build-push-action@v5
  with:
  context: .
  platforms: linux/amd64,linux/arm64

diff --git a/docs/content/usage/actions/act-runner.en-us.md b/docs/content/usage/actions/act-runner.en-us.md
@@ -114,6 +114,12 @@ If you cannot see the settings page, please make sure that you have the right pe
 
 The format of the registration token is a random string `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`.
 
+A registration token can also be obtained from the gitea [command-line interface](../../administration/command-line.en-us.md#actions-generate-runner-token):
+
+```
+gitea --config /etc/gitea/app.ini actions generate-runner-token
+```
+
 ### Register the runner
 
 The act runner can be registered by running the following command:

diff --git a/docs/content/usage/actions/act-runner.zh-cn.md b/docs/content/usage/actions/act-runner.zh-cn.md
@@ -113,6 +113,8 @@ Runner级别决定了从哪里获取注册令牌。
 
 注册令牌的格式是一个随机字符串 `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`。
 
+注册令牌也可以通过 Gitea 的 [命令行](../../administration/command-line.en-us.md#actions-generate-runner-token) 获得:
+
 ### 注册Runner
 
 可以通过运行以下命令来注册Act Runner：

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
@@ -548,6 +548,8 @@ var migrations = []Migration{
  NewMigration("Rename user themes", v1_22.RenameUserThemes),
  // v281 -> v282
  NewMigration("Add auth_token table", v1_22.CreateAuthTokenTable),
+ // v282 -> v283
+ NewMigration("Add Index to pull_auto_merge.doer_id", v1_22.AddIndexToPullAutoMergeDoerID),
 }
 
 // GetCurrentDBVersion returns the current db version

diff --git a/models/migrations/v1_22/v282.go b/models/migrations/v1_22/v282.go
@@ -0,0 +1,16 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_22 //nolint
+
+import (
+ "xorm.io/xorm"
+)
+
+func AddIndexToPullAutoMergeDoerID(x *xorm.Engine) error {
+ type PullAutoMerge struct {
+ DoerID int64 `xorm:"INDEX NOT NULL"`
+ }
+
+ return x.Sync(&PullAutoMerge{})
+}
diff --git a/models/packages/container/search.go b/models/packages/container/search.go
@@ -207,6 +207,9 @@ func (opts *ImageTagsSearchOptions) configureOrderBy(e db.Engine) {
  default:
  e.Desc("package_version.created_unix")
  }
+
+ // Sort by id for stable order with duplicates in the other field
+ e.Asc("package_version.id")
 }
 
 // SearchImageTags gets a sorted list of the tags of an image