Merge branch 'main' into fix-gitlab-inherited-permissions

woodpecker-ci · Feb 5, 2024 · b3d91b8 · b3d91b8
2 parents ea86b89 + e324d18
commit b3d91b8
Show file tree

Hide file tree

Showing 8 changed files with 1,008 additions and 1,000 deletions.
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
@@ -11,7 +11,7 @@ variables:
   - &node_image 'docker.io/node:21-alpine'
   - &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.6'
   - &xgo_version 'go-1.21.2'
-  - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.0.0'
+  - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.0.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'
   - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'
   - &platforms_preview 'linux/amd64'

diff --git a/docs/plugins/woodpecker-plugins/package.json b/docs/plugins/woodpecker-plugins/package.json
@@ -19,7 +19,7 @@
     "axios": "^1.6.0",
     "concurrently": "^8.0.0",
     "isomorphic-dompurify": "^2.0.0",
-    "marked": "^11.0.0",
+    "marked": "^12.0.0",
     "tslib": "^2.6.1",
     "typescript": "^5.0.0"
   },

diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/kinbiko/jsonassert v1.1.1
 	github.com/lib/pq v1.10.9
 	github.com/mattn/go-sqlite3 v1.14.20
-	github.com/moby/moby v24.0.8+incompatible
+	github.com/moby/moby v24.0.9+incompatible
 	github.com/moby/term v0.5.0
 	github.com/muesli/termenv v0.15.2
 	github.com/oklog/ulid/v2 v2.1.0

diff --git a/go.sum b/go.sum
@@ -320,6 +320,8 @@ github.com/moby/moby v24.0.7+incompatible h1:RrVT5IXBn85mRtFKP+gFwVLCcnNPZIgN3NV
 github.com/moby/moby v24.0.7+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/moby v24.0.8+incompatible h1:lTOrmnT/ZwYrhTbcmkWMTd2Pk65vV+4YuEdIG04shac=
 github.com/moby/moby v24.0.8+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/moby/moby v24.0.9+incompatible h1:Z/hFbZJqC5Fmuf6jesMLdHU71CMAgdiSJ1ZYey+bFmg=
+github.com/moby/moby v24.0.9+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=