Merge branch 'origin/main' into 'next-release/main'

.woodpecker/binaries.yaml

@@ -4,8 +4,7 @@ when:
 variables:
   - &golang_image 'docker.io/golang:1.22.2'
   - &node_image 'docker.io/node:22-alpine'
-  # TODO: switch back to upstream image after https://github.com/techknowlogick/xgo/pull/224 got merged
-  - &xgo_image 'docker.io/pats22/xgo:go-1.22.1'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.2'
   - &xgo_version 'go-1.21.2'
 
 steps:

.woodpecker/docker.yaml

@@ -1,8 +1,7 @@
 variables:
   - &golang_image 'docker.io/golang:1.22.2'
   - &node_image 'docker.io/node:22-alpine'
-  # TODO: switch back to upstream image after https://github.com/techknowlogick/xgo/pull/224 got merged
-  - &xgo_image 'docker.io/pats22/xgo:go-1.22.1'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.2'
   - &xgo_version 'go-1.21.2'
   - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.2.1'
   - &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64'

pipeline/frontend/yaml/types/container_test.go

@@ -141,7 +141,7 @@ func TestUnmarshalContainer(t *testing.T) {
 	assert.EqualValues(t, want, got, "problem parsing container")
 }
 
-// TestUnmarshalContainersErr unmarshals a map of containers. The order is
+// TestUnmarshalContainers unmarshals a map of containers. The order is
 // retained and the container key may be used as the container name if a
 // name is not explicitly provided.
 func TestUnmarshalContainers(t *testing.T) {

server/forge/bitbucket/convert.go

@@ -141,7 +141,7 @@ func convertUser(from *internal.Account, token *oauth2.Token) *model.User {
 	}
 }
 
-// convertTeamList is a helper function used to convert a Bitbucket team list
+// convertWorkspaceList is a helper function used to convert a Bitbucket team list
 // structure to the Woodpecker Team structure.
 func convertWorkspaceList(from []*internal.Workspace) []*model.Team {
 	var teams []*model.Team
@@ -151,7 +151,7 @@ func convertWorkspaceList(from []*internal.Workspace) []*model.Team {
 	return teams
 }
 
-// convertTeam is a helper function used to convert a Bitbucket team account
+// convertWorkspace is a helper function used to convert a Bitbucket team account
 // structure to the Woodpecker Team structure.
 func convertWorkspace(from *internal.Workspace) *model.Team {
 	return &model.Team{

server/forge/github/convert.go

@@ -161,7 +161,7 @@ func convertRepoHook(eventRepo *github.PushEventRepository) *model.Repo {
 	return repo
 }
 
-// covertLabels is a helper function used to convert a GitHub label list to
+// convertLabels is a helper function used to convert a GitHub label list to
 // the common Woodpecker label structure.
 func convertLabels(from []*github.Label) []string {
 	labels := make([]string, len(from))

web/src/views/repo/RepoWrapper.vue

@@ -17,7 +17,7 @@
       <a v-if="badgeUrl" :href="badgeUrl" target="_blank">
         <img :src="badgeUrl" />
       </a>
-      <IconButton :href="repo.forge_url" :title="$t('repo.open_in_forge')" :icon="forge ?? 'repo'" />
+      <IconButton :href="repo.forge_url" :title="$t('repo.open_in_forge')" :icon="forge ?? 'repo'" class="forge" />
       <IconButton
         v-if="repoPermissions.admin"
         :to="{ name: 'repo-settings' }"

woodpecker-go/woodpecker/global_secret.go

@@ -7,7 +7,7 @@ const (
 	pathGlobalSecret  = "%s/api/secrets/%s"
 )
 
-// GlobalOrgSecret returns an global secret by name.
+// GlobalSecret returns an global secret by name.
 func (c *client) GlobalSecret(secret string) (*Secret, error) {
 	out := new(Secret)
 	uri := fmt.Sprintf(pathGlobalSecret, c.addr, secret)