Merge remote-tracking branch 'upstream/main' into 3582-k8s-secrets-p1

.woodpecker/binaries.yaml

@@ -3,7 +3,7 @@ when:
 
 variables:
   - &golang_image 'docker.io/golang:1.22.2'
-  - &node_image 'docker.io/node:21-alpine'
+  - &node_image 'docker.io/node:22-alpine'
   - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.1'
   - &xgo_version 'go-1.21.2'
 

.woodpecker/docker.yaml

@@ -1,6 +1,6 @@
 variables:
   - &golang_image 'docker.io/golang:1.22.2'
-  - &node_image 'docker.io/node:21-alpine'
+  - &node_image 'docker.io/node:22-alpine'
   - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.1'
   - &xgo_version 'go-1.21.2'
   - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.2.1'

.woodpecker/static.yaml

@@ -13,7 +13,7 @@ steps:
         branch: renovate/*
 
   - name: spellcheck
-    image: docker.io/node:21-alpine
+    image: docker.io/node:22-alpine
     depends_on: []
     commands:
       - corepack enable

.woodpecker/web.yaml

@@ -6,7 +6,7 @@ when:
       - renovate/*
 
 variables:
-  - &node_image 'docker.io/node:21-alpine'
+  - &node_image 'docker.io/node:22-alpine'
   - &when
     path:
       # related config files

docker/Dockerfile.make

@@ -1,6 +1,6 @@
 # docker build --rm  -f docker/Dockerfile.make -t woodpecker/make:local .
 FROM docker.io/golang:1.22-alpine3.19 as golang_image
-FROM docker.io/node:21-alpine3.19
+FROM docker.io/node:22-alpine3.19
 
 # renovate: datasource=repology depName=alpine_3_19/make versioning=loose
 ENV MAKE_VERSION="4.4.1-r2"

docs/package.json

@@ -53,8 +53,8 @@
   },
   "pnpm": {
     "overrides": {
-      "trim": "^0.0.3",
-      "got": "^11.8.5"
+      "trim": "^1.0.0",
+      "got": "^14.0.0"
     }
   }
 }

server/store/datastore/pipeline.go

@@ -59,11 +59,11 @@ func (s storage) GetPipelineList(repo *model.Repo, p *model.ListOptions, f *mode
 
 	if f != nil {
 		if f.After != 0 {
-			cond = cond.And(builder.Gt{"pipeline_started": f.After})
+			cond = cond.And(builder.Gt{"pipeline_created": f.After})
 		}
 
 		if f.Before != 0 {
-			cond = cond.And(builder.Lt{"pipeline_started": f.Before})
+			cond = cond.And(builder.Lt{"pipeline_created": f.Before})
 		}
 	}
 

server/store/datastore/pipeline_test.go

@@ -231,21 +231,19 @@ func TestPipelines(t *testing.T) {
 		})
 
 		g.It("Should get filtered pipelines", func() {
-			dt1, _ := time.Parse(time.RFC3339, "2023-01-15T15:00:00Z")
 			pipeline1 := &model.Pipeline{
-				RepoID:  repo.ID,
-				Started: dt1.Unix(),
+				RepoID: repo.ID,
 			}
-			dt2, _ := time.Parse(time.RFC3339, "2023-01-15T16:30:00Z")
 			pipeline2 := &model.Pipeline{
-				RepoID:  repo.ID,
-				Started: dt2.Unix(),
+				RepoID: repo.ID,
 			}
 			err1 := store.CreatePipeline(pipeline1, []*model.Step{}...)
 			g.Assert(err1).IsNil()
+			time.Sleep(1 * time.Second)
+			before := time.Now().Unix()
 			err2 := store.CreatePipeline(pipeline2, []*model.Step{}...)
 			g.Assert(err2).IsNil()
-			pipelines, err3 := store.GetPipelineList(&model.Repo{ID: 1}, &model.ListOptions{Page: 1, PerPage: 50}, &model.PipelineFilter{Before: dt2.Unix()})
+			pipelines, err3 := store.GetPipelineList(&model.Repo{ID: 1}, &model.ListOptions{Page: 1, PerPage: 50}, &model.PipelineFilter{Before: before})
 			g.Assert(err3).IsNil()
 			g.Assert(len(pipelines)).Equal(1)
 			g.Assert(pipelines[0].ID).Equal(pipeline1.ID)