Git/gitea-tea
1
0
Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2026-08-06 07:17:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into refactor/embed-credstore

Browse Source
This commit is contained in:
bircni
2026-08-06 05:06:10 +00:00
parent b645a189a2 12726f4c9b
commit 98175d7135
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/release-nightly.yml
+1
View File
@@ -27,6 +27,7 @@ jobs:
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7 - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
with: with:
go-version-file: "go.mod" go-version-file: "go.mod"
check-latest: true
- name: import gpg - name: import gpg
id: import_gpg id: import_gpg
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7 uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7
.gitea/workflows/release-tag.yml
+1
View File
@@ -28,6 +28,7 @@ jobs:
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7 - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
with: with:
go-version-file: 'go.mod' go-version-file: 'go.mod'
check-latest: true
- name: import gpg - name: import gpg
id: import_gpg id: import_gpg
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7 uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7
.gitea/workflows/test-pr.yml
+2
View File
@@ -20,6 +20,7 @@ jobs:
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7 - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
with: with:
go-version-file: 'go.mod' go-version-file: 'go.mod'
check-latest: true
- name: lint and build - name: lint and build
run: | run: |
make clean make clean
@@ -45,6 +46,7 @@ jobs:
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7 - uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
with: with:
go-version-file: 'go.mod' go-version-file: 'go.mod'
check-latest: true
- name: wait for the gitea instance to be ready - name: wait for the gitea instance to be ready
run: | run: |
for i in $(seq 1 30); do for i in $(seq 1 30); do
Makefile
+5
View File
@@ -118,7 +118,12 @@ unit-test-coverage:
.PHONY: tidy .PHONY: tidy
tidy: tidy:
$(eval GO_TOOLCHAIN := $(shell grep -Eo '^toolchain\s+go[0-9.]+' go.mod | cut -d' ' -f2))
$(GO) mod tidy $(GO) mod tidy
@# workaround https://github.com/golang/go/issues/75331: restore toolchain if tidy dropped it
@if [ -n "$(GO_TOOLCHAIN)" ] && ! grep -qE '^toolchain\s' go.mod; then \
$(GO) mod edit -toolchain=$(GO_TOOLCHAIN); \
fi
.PHONY: check .PHONY: check
check: test check: test
go.mod
+3 -1
View File
@@ -1,6 +1,8 @@
module gitea.dev/tea module gitea.dev/tea
go 1.26 go 1.26.0
toolchain go1.26.5
require ( require (
charm.land/glamour/v2 v2.0.1 charm.land/glamour/v2 v2.0.1
renovate.json5
+1 -3
View File
@@ -1,8 +1,6 @@
{ {
"$schema": "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [ "extends": [
"local>gitea/renovate-config", "local>gitea/renovate-config"
"local>gitea/renovate-config:security",
"local>gitea/renovate-config:go-deps"
] ]
} }