Merge branch 'main' into feat/add-authentication-via-env-variables

Reviewed-on: https://gitea.com/gitea/tea/pulls/640

.gitea/workflows/release-nightly.yml

@@ -12,18 +12,17 @@ jobs:
         with:
           fetch-depth: 0
       - run: git fetch --force --tags
-      - name: setup go
-        uses: https://github.com/actions/setup-go@v5
+      - uses: actions/setup-go@v5
         with:
           go-version: '>=1.20.1'
       - name: import gpg
         id: import_gpg
-        uses: https://github.com/crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
           passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
       - name: goreleaser
-        uses: https://github.com/goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v5
         with:
             distribution: goreleaser-pro
             version: latest
@@ -37,10 +36,9 @@ jobs:
           S3_BUCKET: ${{ secrets.AWS_BUCKET }}
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
           GPGSIGN_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }}
+          GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   release-image:
     runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
     env:
       DOCKER_ORG: gitea
       DOCKER_LATEST: nightly

.gitea/workflows/release-tag.yml

@@ -13,19 +13,18 @@ jobs:
         with:
           fetch-depth: 0
       - run: git fetch --force --tags
-      - name: setup go
-        uses: https://github.com/actions/setup-go@v5
+      - uses: actions/setup-go@v5
         with:
-          go-version: '>=1.20.1'
+          go-version-file: 'go.mod'
       - name: import gpg
         id: import_gpg
-        uses: https://github.com/crazy-max/ghaction-import-gpg@v6
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
           passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
           fingerprint: CC64B1DB67ABBEECAB24B6455FC346329753F4B0
       - name: goreleaser
-        uses: https://github.com/goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v5
         with:
             distribution: goreleaser-pro
             version: latest

.gitea/workflows/test-pr.yml

@@ -1,7 +1,6 @@
 name: check-and-test
 
-on: 
-  - push
+on:
   - pull_request
 
 jobs:
@@ -9,10 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: setup go
-        uses: https://github.com/actions/setup-go@v5
+      - uses: actions/setup-go@v5
         with:
-          go-version: '>=1.20.1'
+          go-version-file: 'go.mod'
       - name: lint and build
         run: |
           make clean

.goreleaser.yaml

@@ -96,9 +96,7 @@ checksum:
   extra_files:
       - glob: ./**.xz
 
-env_files:
-  # override gitea actions which passes GITHUB_TOKEN to set env var as null
-  github_token: /dev/null
+force_token: gitea
 
 signs:
   -

LICENSE

@@ -1,5 +1,4 @@
 Copyright (c) 2016 The Gitea Authors
-Copyright (c) 2015 The Gogs Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

modules/context/context.go

@@ -258,7 +258,7 @@ func GetLoginByEnvVar() *config.Login {
 
 	serverURL, err := utils.ValidateAuthenticationMethod(giteaInstanceUrl, token, "", "", false, "", "")
 	if err != nil {
-		fmt.Errorf("%v", err)
+		_ = fmt.Errorf("%v", err)
 	}
 
 	login := &config.Login{

modules/utils/validate.go

@@ -1,3 +1,6 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package utils
 
 import (