Skip to content

Commit

Permalink
Merge tag 'v2.7.0' into single-workflow
Browse files Browse the repository at this point in the history
; Conflicts:
;	cmd/agent/core/agent.go
;	cmd/agent/core/flags.go
  • Loading branch information
theanurin committed Aug 9, 2024
2 parents 98334f0 + 805c315 commit f890be9
Show file tree
Hide file tree
Showing 946 changed files with 28,385 additions and 41,222 deletions.
108 changes: 65 additions & 43 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,141 +12,164 @@
],
"words": [
"abool",
"BUILDPLATFORM",
"Codeberg",
"Curr",
"DATASOURCE",
"Debugf",
"Fediverse",
"Fogas",
"GOARCH",
"GOBIN",
"GODEBUG",
"GOPATH",
"Georgiana",
"HEALTHCHECK",
"HTTPFS",
"Hetzner",
"Infof",
"Ionescu",
"Kaniko",
"Keyfunc",
"LASTEXITCODE",
"Laszlo",
"Msgf",
"Netrc",
"PROTOC",
"Pinia",
"Println",
"pwsh",
"Refspec",
"Reviewdog",
"Rydzewski",
"SSHURL",
"TARGETARCH",
"TARGETOS",
"Typeflag",
"Upsert",
"WORKDIR",
"Warnf",
"Weblate",
"Wrapf",
"anbraten",
"antfu",
"apimachinery",
"autoincr",
"autoscaler",
"binutils",
"bitbucketdatacenter",
"Boguslawski",
"bradrydzewski",
"BUILDPLATFORM",
"buildx",
"ccmenu",
"certmagic",
"charmbracelet",
"ciphertext",
"Codeberg",
"compatiblelicenses",
"corepack",
"cpuset",
"creativecommons",
"Curr",
"datacenter",
"DATASOURCE",
"Debugf",
"desaturate",
"devx",
"doublestar",
"envsubst",
"estree",
"errgroup",
"estree",
"evenodd",
"excalidraw",
"favicons",
"Fediverse",
"Fogas",
"forbidigo",
"Forgejo",
"fsnotify",
"Georgiana",
"gitea",
"GOARCH",
"GOBIN",
"gocritic",
"GODEBUG",
"golangci",
"gomod",
"gonic",
"GOPATH",
"HEALTHCHECK",
"healthz",
"Hetzner",
"HTMLURL",
"HTTPFS",
"httpsig",
"HTTPURL",
"httputil",
"ianvs",
"iconify",
"Infof",
"Informatyka",
"intlify",
"Ionescu",
"Kaniko",
"Keyfunc",
"kyvg",
"LASTEXITCODE",
"Laszlo",
"laszlocph",
"logfile",
"loglevel",
"LONGBLOB",
"LONGTEXT",
"mapstructure",
"markdownlint",
"memswap",
"Metas",
"mhmxs",
"moby",
"Msgf",
"multiarch",
"multierr",
"netdns",
"Netrc",
"nfpm",
"nixos",
"nocolor",
"nolint",
"norunningpipelines",
"nosniff",
"octocat",
"Pinia",
"pkce",
"posix",
"ppid",
"Println",
"prismjs",
"proto",
"protobuf",
"protoc",
"PROTOC",
"protoimpl",
"protoreflect",
"rawurl",
"pullrequest",
"pullrequests",
"pwsh",
"Redirections",
"Refspec",
"regcred",
"repology",
"reslimit",
"Reviewdog",
"riscv",
"rundll32",
"Rydzewski",
"seccomp",
"secprofile",
"securecookie",
"sess",
"shellescape",
"SSHURL",
"stepbuilder",
"stretchr",
"sublicensable",
"swaggo",
"TARGETARCH",
"TARGETOS",
"techknowlogick",
"testdata",
"threadcreate",
"tink",
"tinycolor",
"tmpfs",
"tmpl",
"tolerations",
"tseslint",
"ttlcache",
"typecheck",
"Typeflag",
"unplugin",
"Upsert",
"urfave",
"varchar",
"varz",
"vueuse",
"waivable",
"Warnf",
"Weblate",
"windi",
"windicss",
"woodpeckerci",
"WORKDIR",
"Wrapf",
"xlink",
"xlog",
"xorm",
"xormigrate",
"xyaml",
"yamls",
"zerolog",
"zerologger"
],
Expand Down Expand Up @@ -174,8 +197,7 @@
"**/fixtures/**",
"**/testdata/**",
// TODO: remove the following
"docs/",
"server/"
"docs/"
],
// Exclude imports, because they are also strings.
"ignoreRegExpList": [
Expand Down
10 changes: 10 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>woodpecker-ci/renovate-config"],
"customManagers": [
{
"customType": "regex",
"fileMatch": ["shared/constant/constant.go"],
"matchStrings": [
"//\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+DefaultCloneImage = \"docker.io/woodpeckerci/plugin-git:(?<currentValue>.*)\""
],
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
}
],
"packageRules": [
{
"matchCurrentVersion": "<1.0.0",
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,5 @@ issues:

run:
timeout: 15m
build-tags:
- test
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/golangci/golangci-lint
rev: v1.59.0
rev: v1.59.1
hooks:
- id: golangci-lint
- repo: https://github.com/igorshubovych/markdownlint-cli
Expand All @@ -24,11 +24,11 @@ repos:
- id: checkmake
exclude: '^docker/Dockerfile.make$' # actually a Dockerfile and not a makefile
- repo: https://github.com/hadolint/hadolint
rev: v2.12.0
rev: v2.13.0-beta
hooks:
- id: hadolint
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
rev: v4.0.0-alpha.8
hooks:
- id: prettier
- repo: https://github.com/adrienverge/yamllint.git
Expand Down
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
},
"go.lintTool": "golangci-lint",
"go.lintFlags": ["--fast"],
"go.buildTags": "test",
"eslint.workingDirectories": ["./web"],
"prettier.ignorePath": "./web/.prettierignore"
"prettier.ignorePath": "./web/.prettierignore",
// Auto fix
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
}
}
18 changes: 14 additions & 4 deletions .woodpecker/binaries.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
when:
event: tag
- event: tag
- event: pull_request
branch: ${CI_REPO_DEFAULT_BRANCH}
path: Makefile

variables:
- &golang_image 'docker.io/golang:1.22'
- &node_image 'docker.io/node:22-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.x'

# cspell:words bindata netgo TARGZ
# cspell:words bindata netgo

steps:
build-web:
Expand Down Expand Up @@ -35,7 +38,7 @@ steps:
environment:
PLATFORMS: linux|arm64/v8;linux|amd64;windows|amd64
TAGS: bindata sqlite sqlite_unlock_notify netgo
TARGZ: '1'
ARCHIVE_IT: '1'

build-tarball:
depends_on:
Expand All @@ -50,13 +53,17 @@ steps:
- vendor
image: *golang_image
commands:
- apt update
- apt install -y zip
- make release-agent

build-cli:
depends_on:
- vendor
image: *golang_image
commands:
- apt update
- apt install -y zip
- make release-cli

build-deb-rpm:
Expand Down Expand Up @@ -90,13 +97,16 @@ steps:
release:
depends_on:
- checksums
image: woodpeckerci/plugin-github-release:1.2.0
image: woodpeckerci/plugin-release:0.1.0
settings:
api_key:
from_secret: github_token
files:
- dist/*.tar.gz
- dist/*.zip
- dist/*.deb
- dist/*.rpm
- dist/checksums.txt
title: ${CI_COMMIT_TAG##v}
when:
event: tag
4 changes: 2 additions & 2 deletions .woodpecker/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ variables:
- &golang_image 'docker.io/golang:1.22'
- &node_image 'docker.io/node:22-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.x'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:4.0.0'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:4.1.0'
- &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'
- &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'
- &platforms_preview 'linux/amd64'
- &platforms_alpine 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le'
- &build_args 'CI_COMMIT_SHA=${CI_COMMIT_SHA},CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH},CI_COMMIT_TAG=${CI_COMMIT_TAG}'

# cspell:words woodpeckerbot netgo TARGZ
# cspell:words woodpeckerbot netgo

# vars used on push / tag events only
- publish_logins: &publish_logins # Default DockerHub login
Expand Down
5 changes: 1 addition & 4 deletions .woodpecker/securityscan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ when:
- renovate/*

variables:
- &trivy_plugin docker.io/woodpeckerci/plugin-trivy:1.0.1
- &trivy_plugin docker.io/woodpeckerci/plugin-trivy:1.1.0

steps:
backend:
Expand All @@ -21,9 +21,6 @@ steps:
settings:
skip-dirs: node_modules/,plugins/woodpecker-plugins/node_modules/
dir: docs/
# well we should check it, but we can not do much about old deps if docusaurus do not take that seriously
# but this is not an issue as we just generate a static site anyway ...
failure: ignore

web:
depends_on: []
Expand Down
2 changes: 1 addition & 1 deletion .woodpecker/social.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ steps:
- name: mastodon-toot
image: docker.io/woodpeckerci/plugin-mastodon-post
settings:
server: https://floss.social
server_url: https://floss.social
access_token:
from_secret: mastodon_token
visibility: public
Expand Down
Loading

0 comments on commit f890be9

Please sign in to comment.