Merge branch 'upstream-main'

Revert miniflux#3814
Partly revert miniflux#3819

Author: dsh2dsh

Makefile

@@ -100,8 +100,8 @@ test:
 
 lint:
 	go vet ./...
-	staticcheck ./...
-	golangci-lint run --disable errcheck --enable sqlclosecheck --enable misspell --enable gofmt --enable goimports --enable whitespace
+	gofmt -d -e .
+	golangci-lint run
 
 integration-test:
 	psql -U postgres -c 'drop database if exists miniflux_test;'

internal/integration/betula/betula.go

@@ -1,4 +1,7 @@
-package betula
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package betula // import "miniflux.app/v2/internal/integration/betula"
 
 import (
 	"fmt"

internal/integration/linkace/linkace.go

@@ -1,4 +1,7 @@
-package linkace
+// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package linkace // import "miniflux.app/v2/internal/integration/linkace"
 
 import (
 	"bytes"