From ea9483be9471908eae49af986fd65117b6453724 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:39:11 +0200 Subject: [PATCH 01/26] remove CI_BUILD_NUMBER --- docs/docs/20-usage/20-pipeline-syntax.md | 2 +- .../versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md | 2 +- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/docs/20-usage/20-pipeline-syntax.md b/docs/docs/20-usage/20-pipeline-syntax.md index c674e3ce37b..57cb0550413 100644 --- a/docs/docs/20-usage/20-pipeline-syntax.md +++ b/docs/docs/20-usage/20-pipeline-syntax.md @@ -452,7 +452,7 @@ Run on pushes to the default branch for the repository `owner/repo`: ```yaml when: - - evaluate: 'CI_BUILD_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' + - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' ``` Run on commits created by user `woodpecker-ci`: diff --git a/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md b/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md index c674e3ce37b..57cb0550413 100644 --- a/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md +++ b/docs/versioned_docs/version-1.0/20-usage/20-pipeline-syntax.md @@ -452,7 +452,7 @@ Run on pushes to the default branch for the repository `owner/repo`: ```yaml when: - - evaluate: 'CI_BUILD_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' + - evaluate: 'CI_PIPELINE_EVENT == "push" && CI_REPO == "owner/repo" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH' ``` Run on commits created by user `woodpecker-ci`: diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 854e39f3bfe..be27f345da1 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -14,7 +14,6 @@ CI_BUILD_CREATED=1685749339 CI_BUILD_EVENT=pull_request CI_BUILD_FINISHED=1685749350 CI_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9 -CI_BUILD_NUMBER=41 CI_BUILD_STARTED=1685749339 CI_BUILD_STATUS=success CI_COMMIT_AUTHOR=6543 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 30a80381ef0..265d8b406c5 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_NUMBER": strconv.FormatInt(m.Curr.Number, 10), "CI_BUILD_PARENT": strconv.FormatInt(m.Curr.Parent, 10), "CI_BUILD_EVENT": m.Curr.Event, "CI_BUILD_LINK": m.Curr.Link, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 9574e67f54b..aaf19479e6b 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -70,7 +70,7 @@ func TestMetadataFromStruct(t *testing.T) { name: "Test with empty info", expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_NUMBER": "0", "CI_BUILD_PARENT": "0", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_PARENT": "0", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { Workflow: metadata.Workflow{Name: "hello"}, }, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_NUMBER": "3", "CI_BUILD_PARENT": "0", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_PARENT": "0", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", From a2c0a6bdc807c0a8aca7480d1d555e2d4b1fed81 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:44:37 +0200 Subject: [PATCH 02/26] clarify vars --- docs/versioned_docs/version-1.0/20-usage/50-environment.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/versioned_docs/version-1.0/20-usage/50-environment.md b/docs/versioned_docs/version-1.0/20-usage/50-environment.md index cb2bf236213..fd3100782ef 100644 --- a/docs/versioned_docs/version-1.0/20-usage/50-environment.md +++ b/docs/versioned_docs/version-1.0/20-usage/50-environment.md @@ -65,8 +65,8 @@ This is the reference list of all environment variables available to your pipeli | `CI_COMMIT_REF` | commit ref | | `CI_COMMIT_REFSPEC` | commit ref spec | | `CI_COMMIT_BRANCH` | commit branch (equals target branch for pull requests) | -| `CI_COMMIT_SOURCE_BRANCH` | commit source branch | -| `CI_COMMIT_TARGET_BRANCH` | commit target branch | +| `CI_COMMIT_SOURCE_BRANCH` | commit source branch (empty if event is not `pull_request`) | +| `CI_COMMIT_TARGET_BRANCH` | commit target branch (empty if event is not `pull_request`) | | `CI_COMMIT_TAG` | commit tag name (empty if event is not `tag`) | | `CI_COMMIT_PULL_REQUEST` | commit pull request number (empty if event is not `pull_request`) | | `CI_COMMIT_PULL_REQUEST_LABELS` | labels assigned to pull request (empty if event is not `pull_request`) | From c8042cdf2b6dd7215f0b19c9b81875a5f641fbec Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:47:02 +0200 Subject: [PATCH 03/26] remove CI_BUILD_PARENT --- pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 265d8b406c5..952813a30b6 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_PARENT": strconv.FormatInt(m.Curr.Parent, 10), "CI_BUILD_EVENT": m.Curr.Event, "CI_BUILD_LINK": m.Curr.Link, "CI_BUILD_DEPLOY_TARGET": m.Curr.Target, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index aaf19479e6b..16ec41ac84a 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -70,7 +70,7 @@ func TestMetadataFromStruct(t *testing.T) { name: "Test with empty info", expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_PARENT": "0", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { Workflow: metadata.Workflow{Name: "hello"}, }, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_PARENT": "0", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", From be09a3df0a71830b8ad3c380266c3ef056f1a09c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:48:34 +0200 Subject: [PATCH 04/26] remove CI_BUILD_EVENT --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index be27f345da1..8cbe5652910 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -11,7 +11,6 @@ import ( func TestSetDroneEnviron(t *testing.T) { woodpeckerVars := `CI=woodpecker CI_BUILD_CREATED=1685749339 -CI_BUILD_EVENT=pull_request CI_BUILD_FINISHED=1685749350 CI_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9 CI_BUILD_STARTED=1685749339 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 952813a30b6..d2bf9876d32 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_EVENT": m.Curr.Event, "CI_BUILD_LINK": m.Curr.Link, "CI_BUILD_DEPLOY_TARGET": m.Curr.Target, "CI_BUILD_STATUS": m.Curr.Status, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 16ec41ac84a..6fd7437bcf1 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -70,7 +70,7 @@ func TestMetadataFromStruct(t *testing.T) { name: "Test with empty info", expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { Workflow: metadata.Workflow{Name: "hello"}, }, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_EVENT": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", From cfba01024199724501ee81fc00230c8dc5af8cd7 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:51:53 +0200 Subject: [PATCH 05/26] remove CI_BUILD_DEPLOY_TARGET & CI_BUILD_LINK --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 10 ++++------ pipeline/frontend/metadata_test.go | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 8cbe5652910..6f915965968 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -12,7 +12,6 @@ func TestSetDroneEnviron(t *testing.T) { woodpeckerVars := `CI=woodpecker CI_BUILD_CREATED=1685749339 CI_BUILD_FINISHED=1685749350 -CI_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9 CI_BUILD_STARTED=1685749339 CI_BUILD_STATUS=success CI_COMMIT_AUTHOR=6543 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index d2bf9876d32..f1b11c481ad 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,12 +115,10 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_LINK": m.Curr.Link, - "CI_BUILD_DEPLOY_TARGET": m.Curr.Target, - "CI_BUILD_STATUS": m.Curr.Status, - "CI_BUILD_CREATED": strconv.FormatInt(m.Curr.Created, 10), - "CI_BUILD_STARTED": strconv.FormatInt(m.Curr.Started, 10), - "CI_BUILD_FINISHED": strconv.FormatInt(m.Curr.Finished, 10), + "CI_BUILD_STATUS": m.Curr.Status, + "CI_BUILD_CREATED": strconv.FormatInt(m.Curr.Created, 10), + "CI_BUILD_STARTED": strconv.FormatInt(m.Curr.Started, 10), + "CI_BUILD_FINISHED": strconv.FormatInt(m.Curr.Finished, 10), // use CI_PREV_PIPELINE_* "CI_PREV_BUILD_NUMBER": strconv.FormatInt(m.Prev.Number, 10), "CI_PREV_BUILD_PARENT": strconv.FormatInt(m.Prev.Parent, 10), diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 6fd7437bcf1..e8c902702af 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -70,7 +70,7 @@ func TestMetadataFromStruct(t *testing.T) { name: "Test with empty info", expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_FINISHED": "0", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { Workflow: metadata.Workflow{Name: "hello"}, }, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_DEPLOY_TARGET": "", "CI_BUILD_FINISHED": "0", "CI_BUILD_LINK": "", + "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_FINISHED": "0", "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", From e92b179f87b11e70efa9683accb548a2588203f3 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:55:02 +0200 Subject: [PATCH 06/26] remove CI_BUILD_STATUS --- agent/tracer.go | 2 -- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- pipeline/tracer.go | 2 -- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/agent/tracer.go b/agent/tracer.go index 91fcdbc8d95..61a6212b7b5 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -79,7 +79,6 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo state.Pipeline.Step.Environment["CI_SYSTEM_ARCH"] = runtime.GOOS + "/" + runtime.GOARCH // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "success" state.Pipeline.Step.Environment["CI_BUILD_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" @@ -91,7 +90,6 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo state.Pipeline.Step.Environment["CI_STEP_STATUS"] = "failure" // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "failure" state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "failure" } diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 6f915965968..a7031651733 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -13,7 +13,6 @@ func TestSetDroneEnviron(t *testing.T) { CI_BUILD_CREATED=1685749339 CI_BUILD_FINISHED=1685749350 CI_BUILD_STARTED=1685749339 -CI_BUILD_STATUS=success CI_COMMIT_AUTHOR=6543 CI_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173 CI_COMMIT_BRANCH=main diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index f1b11c481ad..20789b9324d 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_STATUS": m.Curr.Status, "CI_BUILD_CREATED": strconv.FormatInt(m.Curr.Created, 10), "CI_BUILD_STARTED": strconv.FormatInt(m.Curr.Started, 10), "CI_BUILD_FINISHED": strconv.FormatInt(m.Curr.Finished, 10), diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index e8c902702af..66c47cb5fab 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -71,7 +71,7 @@ func TestMetadataFromStruct(t *testing.T) { expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_FINISHED": "0", - "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", + "CI_BUILD_STARTED": "0", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", @@ -104,7 +104,7 @@ func TestMetadataFromStruct(t *testing.T) { }, expectedEnviron: map[string]string{ "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_FINISHED": "0", - "CI_BUILD_STARTED": "0", "CI_BUILD_STATUS": "", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", + "CI_BUILD_STARTED": "0", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", diff --git a/pipeline/tracer.go b/pipeline/tracer.go index 8c4b5a6fe42..b1d81210d28 100644 --- a/pipeline/tracer.go +++ b/pipeline/tracer.go @@ -38,7 +38,6 @@ var DefaultTracer = TraceFunc(func(state *State) error { state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "success" state.Pipeline.Step.Environment["CI_BUILD_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" @@ -49,7 +48,6 @@ var DefaultTracer = TraceFunc(func(state *State) error { state.Pipeline.Step.Environment["CI_PIPELINE_STATUS"] = "failure" state.Pipeline.Step.Environment["CI_STEP_STATUS"] = "failure" // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_STATUS"] = "failure" state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "failure" } return nil From f85ea32561a36bd58d886537a33d11afbb2d838a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:56:14 +0200 Subject: [PATCH 07/26] remove CI_BUILD_CREATED --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index a7031651733..85b1f57ace9 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -10,7 +10,6 @@ import ( func TestSetDroneEnviron(t *testing.T) { woodpeckerVars := `CI=woodpecker -CI_BUILD_CREATED=1685749339 CI_BUILD_FINISHED=1685749350 CI_BUILD_STARTED=1685749339 CI_COMMIT_AUTHOR=6543 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 20789b9324d..3d527c831a7 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_CREATED": strconv.FormatInt(m.Curr.Created, 10), "CI_BUILD_STARTED": strconv.FormatInt(m.Curr.Started, 10), "CI_BUILD_FINISHED": strconv.FormatInt(m.Curr.Finished, 10), // use CI_PREV_PIPELINE_* diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 66c47cb5fab..eae99ee42a3 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -70,7 +70,7 @@ func TestMetadataFromStruct(t *testing.T) { name: "Test with empty info", expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_FINISHED": "0", + "CI": "woodpecker", "CI_BUILD_FINISHED": "0", "CI_BUILD_STARTED": "0", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { Workflow: metadata.Workflow{Name: "hello"}, }, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_CREATED": "0", "CI_BUILD_FINISHED": "0", + "CI": "woodpecker", "CI_BUILD_FINISHED": "0", "CI_BUILD_STARTED": "0", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", From 6304ea382b0a7ddffd2551459377189a2a84bcef Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:57:54 +0200 Subject: [PATCH 08/26] remove CI_BUILD_STARTED --- agent/tracer.go | 1 - pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- pipeline/tracer.go | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/agent/tracer.go b/agent/tracer.go index 61a6212b7b5..ec113b4b3b4 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -79,7 +79,6 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo state.Pipeline.Step.Environment["CI_SYSTEM_ARCH"] = runtime.GOOS + "/" + runtime.GOARCH // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 85b1f57ace9..27daf0aac5f 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -11,7 +11,6 @@ import ( func TestSetDroneEnviron(t *testing.T) { woodpeckerVars := `CI=woodpecker CI_BUILD_FINISHED=1685749350 -CI_BUILD_STARTED=1685749339 CI_COMMIT_AUTHOR=6543 CI_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173 CI_COMMIT_BRANCH=main diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 3d527c831a7..142d3edf535 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PIPELINE_* - "CI_BUILD_STARTED": strconv.FormatInt(m.Curr.Started, 10), "CI_BUILD_FINISHED": strconv.FormatInt(m.Curr.Finished, 10), // use CI_PREV_PIPELINE_* "CI_PREV_BUILD_NUMBER": strconv.FormatInt(m.Prev.Number, 10), diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index eae99ee42a3..b965a804b77 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -71,7 +71,7 @@ func TestMetadataFromStruct(t *testing.T) { expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ "CI": "woodpecker", "CI_BUILD_FINISHED": "0", - "CI_BUILD_STARTED": "0", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", + "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", @@ -104,7 +104,7 @@ func TestMetadataFromStruct(t *testing.T) { }, expectedEnviron: map[string]string{ "CI": "woodpecker", "CI_BUILD_FINISHED": "0", - "CI_BUILD_STARTED": "0", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", + "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", diff --git a/pipeline/tracer.go b/pipeline/tracer.go index b1d81210d28..1f85a66535b 100644 --- a/pipeline/tracer.go +++ b/pipeline/tracer.go @@ -38,7 +38,6 @@ var DefaultTracer = TraceFunc(func(state *State) error { state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) From 1086f54ee1482e26b2f85ade74d364157098aad5 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 27 Jul 2023 23:59:26 +0200 Subject: [PATCH 09/26] remove CI_BUILD_FINISHED --- agent/tracer.go | 1 - pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 2 -- pipeline/frontend/metadata_test.go | 4 ++-- pipeline/tracer.go | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/agent/tracer.go b/agent/tracer.go index ec113b4b3b4..3f98489da4e 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -79,7 +79,6 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo state.Pipeline.Step.Environment["CI_SYSTEM_ARCH"] = runtime.GOOS + "/" + runtime.GOARCH // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_JOB_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 27daf0aac5f..9684f097966 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -10,7 +10,6 @@ import ( func TestSetDroneEnviron(t *testing.T) { woodpeckerVars := `CI=woodpecker -CI_BUILD_FINISHED=1685749350 CI_COMMIT_AUTHOR=6543 CI_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173 CI_COMMIT_BRANCH=main diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 142d3edf535..4c4e36d3a81 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -114,8 +114,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version - // use CI_PIPELINE_* - "CI_BUILD_FINISHED": strconv.FormatInt(m.Curr.Finished, 10), // use CI_PREV_PIPELINE_* "CI_PREV_BUILD_NUMBER": strconv.FormatInt(m.Prev.Number, 10), "CI_PREV_BUILD_PARENT": strconv.FormatInt(m.Prev.Parent, 10), diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index b965a804b77..ac7e8f752c2 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -70,7 +70,7 @@ func TestMetadataFromStruct(t *testing.T) { name: "Test with empty info", expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_FINISHED": "0", + "CI": "woodpecker", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { Workflow: metadata.Workflow{Name: "hello"}, }, expectedEnviron: map[string]string{ - "CI": "woodpecker", "CI_BUILD_FINISHED": "0", + "CI": "woodpecker", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", diff --git a/pipeline/tracer.go b/pipeline/tracer.go index 1f85a66535b..cfdf8a25893 100644 --- a/pipeline/tracer.go +++ b/pipeline/tracer.go @@ -38,7 +38,6 @@ var DefaultTracer = TraceFunc(func(state *State) error { state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) // DEPRECATED - state.Pipeline.Step.Environment["CI_BUILD_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_JOB_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) From 175a87173d76af749e86d5559dfa85813ed3c027 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:00:36 +0200 Subject: [PATCH 10/26] remove CI_PREV_BUILD_NUMBER --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 9684f097966..2df1df15a64 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -36,7 +36,6 @@ CI_PREV_BUILD_CREATED=1685748680 CI_PREV_BUILD_EVENT=pull_request CI_PREV_BUILD_FINISHED=1685748704 CI_PREV_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13 -CI_PREV_BUILD_NUMBER=40 CI_PREV_BUILD_STARTED=1685748680 CI_PREV_BUILD_STATUS=success CI_PREV_COMMIT_AUTHOR=6543 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 4c4e36d3a81..408ef5a57eb 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PREV_PIPELINE_* - "CI_PREV_BUILD_NUMBER": strconv.FormatInt(m.Prev.Number, 10), "CI_PREV_BUILD_PARENT": strconv.FormatInt(m.Prev.Parent, 10), "CI_PREV_BUILD_EVENT": m.Prev.Event, "CI_PREV_BUILD_LINK": m.Prev.Link, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index ac7e8f752c2..ae2bf585d69 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -76,7 +76,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_NUMBER": "0", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0", + "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0", "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", @@ -109,7 +109,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_NUMBER": "2", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0", + "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0", "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", From 1f53c9ba1b584ca58d0c7de8581e2e384d6e1d96 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:01:25 +0200 Subject: [PATCH 11/26] remove CI_PREV_BUILD_PARENT --- pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 408ef5a57eb..0b213210f97 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use CI_PREV_PIPELINE_* - "CI_PREV_BUILD_PARENT": strconv.FormatInt(m.Prev.Parent, 10), "CI_PREV_BUILD_EVENT": m.Prev.Event, "CI_PREV_BUILD_LINK": m.Prev.Link, "CI_PREV_BUILD_DEPLOY_TARGET": m.Prev.Target, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index ae2bf585d69..4984ad5725a 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -76,7 +76,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0", + "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", @@ -109,7 +109,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_PARENT": "0", "CI_PREV_BUILD_STARTED": "0", + "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", From ea1983d4d8bdebe83393340c44f95c3941d75a62 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:02:13 +0200 Subject: [PATCH 12/26] remove CI_PREV_BUILD_EVENT --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 2df1df15a64..e93fa233269 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -33,7 +33,6 @@ CI_PIPELINE_NUMBER=41 CI_PIPELINE_STARTED=1685749339 CI_PIPELINE_STATUS=success CI_PREV_BUILD_CREATED=1685748680 -CI_PREV_BUILD_EVENT=pull_request CI_PREV_BUILD_FINISHED=1685748704 CI_PREV_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13 CI_PREV_BUILD_STARTED=1685748680 diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 4984ad5725a..53b2143021f 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -76,7 +76,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", + "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", @@ -109,7 +109,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_EVENT": "", "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", + "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", From 31fe820150740c517fef4e4d3ae3a8f4e5761365 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:05:10 +0200 Subject: [PATCH 13/26] remove CI_PREV_BUILD_* --- pipeline/frontend/metadata/drone_compatibility_test.go | 5 ----- pipeline/frontend/metadata/environment.go | 8 -------- pipeline/frontend/metadata_test.go | 10 ++++------ 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index e93fa233269..ff40e990fe3 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -32,11 +32,6 @@ CI_PIPELINE_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9 CI_PIPELINE_NUMBER=41 CI_PIPELINE_STARTED=1685749339 CI_PIPELINE_STATUS=success -CI_PREV_BUILD_CREATED=1685748680 -CI_PREV_BUILD_FINISHED=1685748704 -CI_PREV_BUILD_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13 -CI_PREV_BUILD_STARTED=1685748680 -CI_PREV_BUILD_STATUS=success CI_PREV_COMMIT_AUTHOR=6543 CI_PREV_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173 CI_PREV_COMMIT_BRANCH=main diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 0b213210f97..17327bee7e2 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -114,14 +114,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version - // use CI_PREV_PIPELINE_* - "CI_PREV_BUILD_EVENT": m.Prev.Event, - "CI_PREV_BUILD_LINK": m.Prev.Link, - "CI_PREV_BUILD_DEPLOY_TARGET": m.Prev.Target, - "CI_PREV_BUILD_STATUS": m.Prev.Status, - "CI_PREV_BUILD_CREATED": strconv.FormatInt(m.Prev.Created, 10), - "CI_PREV_BUILD_STARTED": strconv.FormatInt(m.Prev.Started, 10), - "CI_PREV_BUILD_FINISHED": strconv.FormatInt(m.Prev.Finished, 10), // use CI_STEP_* "CI_JOB_NUMBER": strconv.Itoa(m.Step.Number), "CI_JOB_STATUS": "", // will be set by agent diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 53b2143021f..724824aa57f 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -75,9 +75,8 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", - "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", - "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", + "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", + "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_LINK": "", "CI_REPO_REMOTE_ID": "", @@ -108,9 +107,8 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", - "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_BUILD_CREATED": "0", "CI_PREV_BUILD_DEPLOY_TARGET": "", - "CI_PREV_BUILD_FINISHED": "0", "CI_PREV_BUILD_LINK": "", "CI_PREV_BUILD_STARTED": "0", - "CI_PREV_BUILD_STATUS": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", + "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", + "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", From 4860900159ce42ccc8e8cd73d0d71c137e5ded1c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:10:07 +0200 Subject: [PATCH 14/26] remove CI_JOB_* --- agent/tracer.go | 8 -------- cli/exec/flags.go | 4 ++-- pipeline/frontend/metadata/drone_compatibility_test.go | 3 --- pipeline/frontend/metadata/environment.go | 5 ----- pipeline/frontend/metadata_test.go | 8 ++++---- pipeline/tracer.go | 7 ------- 6 files changed, 6 insertions(+), 29 deletions(-) diff --git a/agent/tracer.go b/agent/tracer.go index 3f98489da4e..2740fb6f883 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -78,17 +78,9 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo state.Pipeline.Step.Environment["CI_SYSTEM_ARCH"] = runtime.GOOS + "/" + runtime.GOARCH - // DEPRECATED - state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" - state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) - state.Pipeline.Step.Environment["CI_JOB_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) - if state.Pipeline.Error != nil { state.Pipeline.Step.Environment["CI_PIPELINE_STATUS"] = "failure" state.Pipeline.Step.Environment["CI_STEP_STATUS"] = "failure" - - // DEPRECATED - state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "failure" } return nil diff --git a/cli/exec/flags.go b/cli/exec/flags.go index 0e4fd379265..5279189fb44 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -273,11 +273,11 @@ var flags = []cli.Flag{ Name: "workflow-name", }, &cli.IntFlag{ - EnvVars: []string{"CI_WORKFLOW_NUMBER", "CI_JOB_NUMBER"}, + EnvVars: []string{"CI_WORKFLOW_NUMBER"}, Name: "workflow-number", }, &cli.IntFlag{ - EnvVars: []string{"CI_STEP_NAME", "CI_JOB_NUMBER"}, + EnvVars: []string{"CI_STEP_NAME"}, Name: "step-name", }, &cli.StringSliceFlag{ diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index ff40e990fe3..b1b975af29c 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -21,9 +21,6 @@ CI_COMMIT_REFSPEC=fix_fail-on-err:main CI_COMMIT_SHA=a778b069d9f5992786d2db9be493b43868cfce76 CI_COMMIT_SOURCE_BRANCH=fix_fail-on-err CI_COMMIT_TARGET_BRANCH=main -CI_JOB_FINISHED=1685749350 -CI_JOB_STARTED=1685749339 -CI_JOB_STATUS=success CI_MACHINE=7939910e431b CI_PIPELINE_CREATED=1685749339 CI_PIPELINE_EVENT=pull_request diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 17327bee7e2..849b61ccf1f 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -114,11 +114,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version - // use CI_STEP_* - "CI_JOB_NUMBER": strconv.Itoa(m.Step.Number), - "CI_JOB_STATUS": "", // will be set by agent - "CI_JOB_STARTED": "", // will be set by agent - "CI_JOB_FINISHED": "", // will be set by agent // CI_REPO_CLONE_URL "CI_REPO_REMOTE": m.Repo.CloneURL, // use *_URL diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 724824aa57f..88af5576c52 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -73,8 +73,8 @@ func TestMetadataFromStruct(t *testing.T) { "CI": "woodpecker", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", - "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", "CI_JOB_STARTED": "", - "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", + "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", + "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", @@ -105,8 +105,8 @@ func TestMetadataFromStruct(t *testing.T) { "CI": "woodpecker", "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", - "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_JOB_FINISHED": "", "CI_JOB_NUMBER": "0", - "CI_JOB_STARTED": "", "CI_JOB_STATUS": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", + "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", + "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", diff --git a/pipeline/tracer.go b/pipeline/tracer.go index cfdf8a25893..7c5fd8a2c2d 100644 --- a/pipeline/tracer.go +++ b/pipeline/tracer.go @@ -37,16 +37,9 @@ var DefaultTracer = TraceFunc(func(state *State) error { state.Pipeline.Step.Environment["CI_STEP_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) - // DEPRECATED - state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "success" - state.Pipeline.Step.Environment["CI_JOB_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) - state.Pipeline.Step.Environment["CI_JOB_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) - if state.Pipeline.Error != nil { state.Pipeline.Step.Environment["CI_PIPELINE_STATUS"] = "failure" state.Pipeline.Step.Environment["CI_STEP_STATUS"] = "failure" - // DEPRECATED - state.Pipeline.Step.Environment["CI_JOB_STATUS"] = "failure" } return nil }) From aa06b3076c51365cf7e79e760cb970dd21ca4a7e Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:15:55 +0200 Subject: [PATCH 15/26] remove CI_REPO_REMOTE --- cli/exec/flags.go | 2 +- .../frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 2 -- pipeline/frontend/metadata_test.go | 4 ++-- pipeline/samples/sample_1/pipeline.json | 4 ++-- pipeline/samples/sample_10_windows/pipeline.json | 4 ++-- pipeline/samples/sample_2/pipeline.json | 6 +++--- pipeline/samples/sample_3/pipeline.json | 6 +++--- pipeline/samples/sample_4/pipeline.json | 6 +++--- pipeline/samples/sample_5/pipeline.json | 12 ++++++------ pipeline/samples/sample_6/pipeline.json | 6 +++--- pipeline/samples/sample_9_cache/pipeline.json | 8 ++++---- 12 files changed, 29 insertions(+), 32 deletions(-) diff --git a/cli/exec/flags.go b/cli/exec/flags.go index 5279189fb44..d6766577545 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -128,7 +128,7 @@ var flags = []cli.Flag{ Name: "repo-link", }, &cli.StringFlag{ - EnvVars: []string{"CI_REPO_CLONE_URL", "CI_REPO_REMOTE"}, + EnvVars: []string{"CI_REPO_CLONE_URL"}, Name: "repo-clone-url", }, &cli.StringFlag{ diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index b1b975af29c..2b148832eef 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -50,7 +50,6 @@ CI_REPO_DEFAULT_BRANCH=main CI_REPO_LINK=https://codeberg.org/Epsilon_02/todo-checker CI_REPO_NAME=todo-checker CI_REPO_OWNER=Epsilon_02 -CI_REPO_REMOTE=https://codeberg.org/Epsilon_02/todo-checker.git CI_REPO_SCM=git CI_STEP_FINISHED=1685749350 CI_STEP_NAME=wp_01h1z7v5d1tskaqjexw0ng6w7d_0_step_3 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 849b61ccf1f..043d4b55ecb 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -114,8 +114,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version - // CI_REPO_CLONE_URL - "CI_REPO_REMOTE": m.Repo.CloneURL, // use *_URL "CI_REPO_LINK": m.Repo.Link, "CI_COMMIT_LINK": m.Curr.Link, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 88af5576c52..7d7d3ffb55e 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -80,7 +80,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_LINK": "", "CI_REPO_REMOTE_ID": "", - "CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_REMOTE": "", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "", + "CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "", "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_LINK": "", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "", "CI_WORKFLOW_NUMBER": "0", }, @@ -113,7 +113,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_LINK": "https://gitea.com/testUser/testRepo", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "", - "CI_REPO_REMOTE": "https://gitea.com/testUser/testRepo.git", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "", + "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "", "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_LINK": "https://example.com", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "https://example.com", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "hello", "CI_WORKFLOW_NUMBER": "0", }, diff --git a/pipeline/samples/sample_1/pipeline.json b/pipeline/samples/sample_1/pipeline.json index 329fa5caefe..568c0a7d6e3 100644 --- a/pipeline/samples/sample_1/pipeline.json +++ b/pipeline/samples/sample_1/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -68,7 +68,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJnbyBnZXQgLXQgLi8uLi4iCmdvIGdldCAtdCAuLy4uLgoKZWNobyArICJnbyBidWlsZCIKZ28gYnVpbGQKCmVjaG8gKyAiZ28gdGVzdCAtdiIKZ28gdGVzdCAtdgoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", diff --git a/pipeline/samples/sample_10_windows/pipeline.json b/pipeline/samples/sample_10_windows/pipeline.json index 9bf923530ab..9188aff36f1 100644 --- a/pipeline/samples/sample_10_windows/pipeline.json +++ b/pipeline/samples/sample_10_windows/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "windows/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -75,7 +75,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CiRFcnJvckFjdGlvblByZWZlcmVuY2UgPSAnU3RvcCc7CiZjbWQgL2MgIm1rZGlyIGM6XHJvb3QiOwppZiAoJEVudjpDSV9ORVRSQ19NQUNISU5FKSB7CiRuZXRyYz1bc3RyaW5nXTo6Rm9ybWF0KCJ7MH1cX25ldHJjIiwkRW52OkhPTUUpOwoibWFjaGluZSAkRW52OkNJX05FVFJDX01BQ0hJTkUiID4+ICRuZXRyYzsKImxvZ2luICRFbnY6Q0lfTkVUUkNfVVNFUk5BTUUiID4+ICRuZXRyYzsKInBhc3N3b3JkICRFbnY6Q0lfTkVUUkNfUEFTU1dPUkQiID4+ICRuZXRyYzsKfTsKW0Vudmlyb25tZW50XTo6U2V0RW52aXJvbm1lbnRWYXJpYWJsZSgiQ0lfTkVUUkNfUEFTU1dPUkQiLCRudWxsKTsKW0Vudmlyb25tZW50XTo6U2V0RW52aXJvbm1lbnRWYXJpYWJsZSgiQ0lfU0NSSVBUIiwkbnVsbCk7CltFbnZpcm9ubWVudF06OlNldEVudmlyb25tZW50VmFyaWFibGUoIkRST05FX05FVFJDX1VTRVJOQU1FIiwkbnVsbCk7CltFbnZpcm9ubWVudF06OlNldEVudmlyb25tZW50VmFyaWFibGUoIkRST05FX05FVFJDX1BBU1NXT1JEIiwkbnVsbCk7CgpXcml0ZS1PdXRwdXQgKCcrICJnbyBnZXQgLXQgLlxcLi4uIicpOyAgW0NvbnNvbGVdOjpPdXQuRmx1c2goKQomIGdvIGdldCAtdCAuXC4uLjsgaWYgKCRMQVNURVhJVENPREUgLW5lIDApIHtleGl0ICRMQVNURVhJVENPREV9CgpXcml0ZS1PdXRwdXQgKCcrICJnbyBidWlsZCInKTsgIFtDb25zb2xlXTo6T3V0LkZsdXNoKCkKJiBnbyBidWlsZDsgaWYgKCRMQVNURVhJVENPREUgLW5lIDApIHtleGl0ICRMQVNURVhJVENPREV9CgpXcml0ZS1PdXRwdXQgKCcrICJnbyB0ZXN0IC12IicpOyAgW0NvbnNvbGVdOjpPdXQuRmx1c2goKQomIGdvIHRlc3QgLXY7IGlmICgkTEFTVEVYSVRDT0RFIC1uZSAwKSB7ZXhpdCAkTEFTVEVYSVRDT0RFfQoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "windows/amd64", diff --git a/pipeline/samples/sample_2/pipeline.json b/pipeline/samples/sample_2/pipeline.json index 65313ef26ee..1c71be61d12 100644 --- a/pipeline/samples/sample_2/pipeline.json +++ b/pipeline/samples/sample_2/pipeline.json @@ -23,7 +23,7 @@ "CI_REPO": "go-sql-driver/mysql", "CI_REPO_URL": "https://github.com/go-sql-driver/mysql", "CI_REPO_NAME": "go-sql-driver/mysql", - "CI_REPO_REMOTE": "https://github.com/go-sql-driver/mysql.git", + "CI_REPO_CLONE_URL": "https://github.com/go-sql-driver/mysql.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -67,7 +67,7 @@ "CI_REPO": "go-sql-driver/mysql", "CI_REPO_URL": "https://github.com/go-sql-driver/mysql", "CI_REPO_NAME": "go-sql-driver/mysql", - "CI_REPO_REMOTE": "https://github.com/go-sql-driver/mysql.git", + "CI_REPO_CLONE_URL": "https://github.com/go-sql-driver/mysql.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -112,7 +112,7 @@ "CI_REPO": "go-sql-driver/mysql", "CI_REPO_URL": "https://github.com/go-sql-driver/mysql", "CI_REPO_NAME": "go-sql-driver/mysql", - "CI_REPO_REMOTE": "https://github.com/go-sql-driver/mysql.git", + "CI_REPO_CLONE_URL": "https://github.com/go-sql-driver/mysql.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJzbGVlcCAyMCIKc2xlZXAgMjAKCmVjaG8gKyAiZ28gZ2V0IC12IC10IgpnbyBnZXQgLXYgLXQKCmVjaG8gKyAiZ28gdGVzdCAtdiIKZ28gdGVzdCAtdgoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", diff --git a/pipeline/samples/sample_3/pipeline.json b/pipeline/samples/sample_3/pipeline.json index 405d6780ce4..58e648ca760 100644 --- a/pipeline/samples/sample_3/pipeline.json +++ b/pipeline/samples/sample_3/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -68,7 +68,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgZmFpbCIKZWNobyB0aGlzIHN0ZXAgc2hvdWxkIGZhaWwKCmVjaG8gKyAiZXhpdCAxIgpleGl0IDEKCg==", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -116,7 +116,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgbmV2ZXIgZXhlY3V0ZSIKZWNobyB0aGlzIHN0ZXAgc2hvdWxkIG5ldmVyIGV4ZWN1dGUKCg==", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", diff --git a/pipeline/samples/sample_4/pipeline.json b/pipeline/samples/sample_4/pipeline.json index 17badb2204f..05640e95862 100644 --- a/pipeline/samples/sample_4/pipeline.json +++ b/pipeline/samples/sample_4/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -68,7 +68,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgZmFpbCIKZWNobyB0aGlzIHN0ZXAgc2hvdWxkIGZhaWwKCmVjaG8gKyAiZXhpdCAxIgpleGl0IDEKCg==", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -116,7 +116,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHRoaXMgc3RlcCBzaG91bGQgZXhlY3V0ZSwgZGVzcGl0ZSBmYWlsdXJlIgplY2hvIHRoaXMgc3RlcCBzaG91bGQgZXhlY3V0ZSwgZGVzcGl0ZSBmYWlsdXJlCgo=", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", diff --git a/pipeline/samples/sample_5/pipeline.json b/pipeline/samples/sample_5/pipeline.json index e898cf08399..c720ef268f3 100644 --- a/pipeline/samples/sample_5/pipeline.json +++ b/pipeline/samples/sample_5/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -68,7 +68,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgMSIKZWNobyBzdGVwIDEKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSAxIgplY2hvIGRvbmUgMQoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -110,7 +110,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgMiIKZWNobyBzdGVwIDIKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSAyIgplY2hvIGRvbmUgMgoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -158,7 +158,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIEkgc2hvdWxkIGV4ZWN1dGUgbGFzdC4iCmVjaG8gSSBzaG91bGQgZXhlY3V0ZSBsYXN0LgoKZWNobyArICJlY2hvIGFmdGVyIHRoZSBwcmlvciB0d28gc3RlcHMgZmluaXNoIGV4ZWN1dGlvbi4iCmVjaG8gYWZ0ZXIgdGhlIHByaW9yIHR3byBzdGVwcyBmaW5pc2ggZXhlY3V0aW9uLgoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -206,7 +206,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgMyIKZWNobyBzdGVwIDMKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSAzIgplY2hvIGRvbmUgMwoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -248,7 +248,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJlY2hvIHN0ZXAgNCIKZWNobyBzdGVwIDQKCmVjaG8gKyAic2xlZXAgMTAiCnNsZWVwIDEwCgplY2hvICsgImVjaG8gZG9uZSA0IgplY2hvIGRvbmUgNAoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", diff --git a/pipeline/samples/sample_6/pipeline.json b/pipeline/samples/sample_6/pipeline.json index 6cbcf367589..4fa9486020b 100644 --- a/pipeline/samples/sample_6/pipeline.json +++ b/pipeline/samples/sample_6/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -79,7 +79,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAoKZWNobyArICJnbyBnZXQgLXQgLi8uLi4iCmdvIGdldCAtdCAuLy4uLgoKZWNobyArICJnbyBidWlsZCIKZ28gYnVpbGQKCmVjaG8gKyAiZ28gdGVzdCAtdiIKZ28gdGVzdCAtdgoK", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -137,7 +137,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", diff --git a/pipeline/samples/sample_9_cache/pipeline.json b/pipeline/samples/sample_9_cache/pipeline.json index dd3319c2c49..c14a845710e 100644 --- a/pipeline/samples/sample_9_cache/pipeline.json +++ b/pipeline/samples/sample_9_cache/pipeline.json @@ -24,7 +24,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -76,7 +76,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", @@ -135,7 +135,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SCRIPT": "CmlmIFsgLW4gIiRDSV9ORVRSQ19NQUNISU5FIiBdOyB0aGVuCmNhdCA8PEVPRiA+ICRIT01FLy5uZXRyYwptYWNoaW5lICRDSV9ORVRSQ19NQUNISU5FCmxvZ2luICRDSV9ORVRSQ19VU0VSTkFNRQpwYXNzd29yZCAkQ0lfTkVUUkNfUEFTU1dPUkQKRU9GCmNobW9kIDA2MDAgJEhPTUUvLm5ldHJjCmZpCnVuc2V0IENJX05FVFJDX1VTRVJOQU1FCnVuc2V0IENJX05FVFJDX1BBU1NXT1JECnVuc2V0IENJX1NDUklQVAp1bnNldCBEUk9ORV9ORVRSQ19VU0VSTkFNRQp1bnNldCBEUk9ORV9ORVRSQ19QQVNTV09SRAoKZWNobyArICJucG0gaW5zdGFsbCIKbnBtIGluc3RhbGwKCmVjaG8gKyAibnBtIHRlc3QiCm5wbSB0ZXN0Cgo=", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", @@ -191,7 +191,7 @@ "CI_REPO": "drone/envsubst", "CI_REPO_URL": "https://github.com/drone/envsubst", "CI_REPO_NAME": "drone/envsubst", - "CI_REPO_REMOTE": "https://github.com/drone/envsubst.git", + "CI_REPO_CLONE_URL": "https://github.com/drone/envsubst.git", "CI_SYSTEM": "pipec", "CI_SYSTEM_PLATFORM": "linux/amd64", "CI_SYSTEM_URL": "https://github.com/cncd/pipec", From ff2d9ade9e85fff79fac08c4362307d21d497148 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:19:59 +0200 Subject: [PATCH 16/26] remove CI_REPO_LINK --- cli/exec/flags.go | 2 +- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cli/exec/flags.go b/cli/exec/flags.go index d6766577545..55c24cfe21d 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -124,7 +124,7 @@ var flags = []cli.Flag{ Name: "repo-remote-id", }, &cli.StringFlag{ - EnvVars: []string{"CI_REPO_URL", "CI_REPO_LINK"}, + EnvVars: []string{"CI_REPO_URL"}, Name: "repo-link", }, &cli.StringFlag{ diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 2b148832eef..f198c89e76c 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -47,7 +47,6 @@ CI_PREV_PIPELINE_STATUS=success CI_REPO=Epsilon_02/todo-checker CI_REPO_CLONE_URL=https://codeberg.org/Epsilon_02/todo-checker.git CI_REPO_DEFAULT_BRANCH=main -CI_REPO_LINK=https://codeberg.org/Epsilon_02/todo-checker CI_REPO_NAME=todo-checker CI_REPO_OWNER=Epsilon_02 CI_REPO_SCM=git diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 043d4b55ecb..ce9d9a43ac0 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use *_URL - "CI_REPO_LINK": m.Repo.Link, "CI_COMMIT_LINK": m.Curr.Link, "CI_PIPELINE_LINK": m.Curr.Link, "CI_PREV_COMMIT_LINK": m.Prev.Link, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 7d7d3ffb55e..37b6f3be14a 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -79,7 +79,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", - "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_LINK": "", "CI_REPO_REMOTE_ID": "", + "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_REMOTE_ID": "", "CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "", "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_LINK": "", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "", "CI_WORKFLOW_NUMBER": "0", @@ -112,7 +112,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", - "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_LINK": "https://gitea.com/testUser/testRepo", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "", + "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "", "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_LINK": "https://example.com", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "https://example.com", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "hello", "CI_WORKFLOW_NUMBER": "0", From e4439de59082051a507436224a1cb3d032235833 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:21:03 +0200 Subject: [PATCH 17/26] remove CI_COMMIT_LINK --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 1 - pipeline/frontend/metadata_test.go | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index f198c89e76c..c1c88a12243 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -13,7 +13,6 @@ func TestSetDroneEnviron(t *testing.T) { CI_COMMIT_AUTHOR=6543 CI_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173 CI_COMMIT_BRANCH=main -CI_COMMIT_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9 CI_COMMIT_MESSAGE=fix testscript CI_COMMIT_PULL_REQUEST=9 CI_COMMIT_REF=refs/pull/9/head diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index ce9d9a43ac0..f1191d120d2 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,7 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use *_URL - "CI_COMMIT_LINK": m.Curr.Link, "CI_PIPELINE_LINK": m.Curr.Link, "CI_PREV_COMMIT_LINK": m.Prev.Link, "CI_PREV_PIPELINE_LINK": m.Prev.Link, diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 37b6f3be14a..3d3741c2d51 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -71,7 +71,7 @@ func TestMetadataFromStruct(t *testing.T) { expectedMetadata: metadata.Metadata{Sys: metadata.System{Name: "woodpecker"}}, expectedEnviron: map[string]string{ "CI": "woodpecker", - "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", + "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", @@ -103,7 +103,7 @@ func TestMetadataFromStruct(t *testing.T) { }, expectedEnviron: map[string]string{ "CI": "woodpecker", - "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_LINK": "", + "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", From 626b9efcdd144d2e4b1393f65d339183706f355c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:23:05 +0200 Subject: [PATCH 18/26] remove CI_PIPELINE_LINK & CI_PREV_COMMIT_LINK --- cli/exec/flags.go | 2 +- pipeline/frontend/metadata/drone_compatibility_test.go | 2 -- pipeline/frontend/metadata/environment.go | 2 -- pipeline/frontend/metadata_test.go | 8 ++++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cli/exec/flags.go b/cli/exec/flags.go index 55c24cfe21d..1396084e3d0 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -169,7 +169,7 @@ var flags = []cli.Flag{ Value: "manual", }, &cli.StringFlag{ - EnvVars: []string{"CI_PIPELINE_URL", "CI_PIPELINE_LINK"}, + EnvVars: []string{"CI_PIPELINE_URL"}, Name: "pipeline-link", }, &cli.StringFlag{ diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index c1c88a12243..dcbca4ef2d9 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -24,14 +24,12 @@ CI_MACHINE=7939910e431b CI_PIPELINE_CREATED=1685749339 CI_PIPELINE_EVENT=pull_request CI_PIPELINE_FINISHED=1685749350 -CI_PIPELINE_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/9 CI_PIPELINE_NUMBER=41 CI_PIPELINE_STARTED=1685749339 CI_PIPELINE_STATUS=success CI_PREV_COMMIT_AUTHOR=6543 CI_PREV_COMMIT_AUTHOR_AVATAR=https://codeberg.org/avatars/09a234c768cb9bca78f6b2f82d6af173 CI_PREV_COMMIT_BRANCH=main -CI_PREV_COMMIT_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13 CI_PREV_COMMIT_MESSAGE=Print filename and linenuber on fail CI_PREV_COMMIT_REF=refs/pull/13/head CI_PREV_COMMIT_REFSPEC=print_file_and_line:main diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index f1191d120d2..9569f8abf39 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,8 +115,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use *_URL - "CI_PIPELINE_LINK": m.Curr.Link, - "CI_PREV_COMMIT_LINK": m.Prev.Link, "CI_PREV_PIPELINE_LINK": m.Prev.Link, "CI_SYSTEM_LINK": m.Sys.Link, } diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 3d3741c2d51..e63ba36fd32 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -74,9 +74,9 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "", "CI_FORGE_URL": "", - "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", "CI_PIPELINE_NUMBER": "0", + "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_NUMBER": "0", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", - "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", + "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_REMOTE_ID": "", @@ -106,9 +106,9 @@ func TestMetadataFromStruct(t *testing.T) { "CI_COMMIT_AUTHOR": "", "CI_COMMIT_AUTHOR_AVATAR": "", "CI_COMMIT_AUTHOR_EMAIL": "", "CI_COMMIT_BRANCH": "", "CI_COMMIT_MESSAGE": "", "CI_COMMIT_PULL_REQUEST": "", "CI_COMMIT_PULL_REQUEST_LABELS": "", "CI_COMMIT_REF": "", "CI_COMMIT_REFSPEC": "", "CI_COMMIT_SHA": "", "CI_COMMIT_SOURCE_BRANCH": "", "CI_COMMIT_TAG": "", "CI_COMMIT_TARGET_BRANCH": "", "CI_COMMIT_URL": "", "CI_FORGE_TYPE": "gitea", "CI_FORGE_URL": "https://gitea.com", - "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_LINK": "", + "CI_PIPELINE_CREATED": "0", "CI_PIPELINE_DEPLOY_TARGET": "", "CI_PIPELINE_EVENT": "", "CI_PIPELINE_FINISHED": "0", "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", - "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_LINK": "", + "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", From 9d9caf3062fa3d2420c21a423b5a281923014db3 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:25:00 +0200 Subject: [PATCH 19/26] remove CI_PREV_PIPELINE_LINK --- cli/exec/flags.go | 2 +- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 3 +-- pipeline/frontend/metadata_test.go | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cli/exec/flags.go b/cli/exec/flags.go index 1396084e3d0..17f3ff4f172 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -233,7 +233,7 @@ var flags = []cli.Flag{ Name: "prev-pipeline-event", }, &cli.StringFlag{ - EnvVars: []string{"CI_PREV_PIPELINE_URL", "CI_PREV_PIPELINE_LINK"}, + EnvVars: []string{"CI_PREV_PIPELINE_URL"}, Name: "prev-pipeline-link", }, &cli.StringFlag{ diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index dcbca4ef2d9..aafef0f6018 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -37,7 +37,6 @@ CI_PREV_COMMIT_SHA=e246aff5a9466df2e522efc9007823a7496d9d41 CI_PREV_PIPELINE_CREATED=1685748680 CI_PREV_PIPELINE_EVENT=pull_request CI_PREV_PIPELINE_FINISHED=1685748704 -CI_PREV_PIPELINE_LINK=https://codeberg.org/Epsilon_02/todo-checker/pulls/13 CI_PREV_PIPELINE_NUMBER=40 CI_PREV_PIPELINE_STARTED=1685748680 CI_PREV_PIPELINE_STATUS=success diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 9569f8abf39..31c868dfc32 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -115,8 +115,7 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version // use *_URL - "CI_PREV_PIPELINE_LINK": m.Prev.Link, - "CI_SYSTEM_LINK": m.Sys.Link, + "CI_SYSTEM_LINK": m.Sys.Link, } if m.Curr.Event == EventTag { params["CI_COMMIT_TAG"] = strings.TrimPrefix(m.Curr.Commit.Ref, "refs/tags/") diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index e63ba36fd32..3fd47ad0bee 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -78,7 +78,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", - "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", + "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_REMOTE_ID": "", "CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "", "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_LINK": "", "CI_SYSTEM_NAME": "woodpecker", @@ -110,7 +110,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PIPELINE_NUMBER": "3", "CI_PIPELINE_PARENT": "0", "CI_PIPELINE_STARTED": "0", "CI_PIPELINE_STATUS": "", "CI_PIPELINE_URL": "", "CI_PREV_COMMIT_AUTHOR": "", "CI_PREV_COMMIT_AUTHOR_AVATAR": "", "CI_PREV_COMMIT_AUTHOR_EMAIL": "", "CI_PREV_COMMIT_BRANCH": "", "CI_PREV_COMMIT_MESSAGE": "", "CI_PREV_COMMIT_REF": "", "CI_PREV_COMMIT_REFSPEC": "", "CI_PREV_COMMIT_SHA": "", "CI_PREV_COMMIT_URL": "", "CI_PREV_PIPELINE_CREATED": "0", - "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_LINK": "", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", + "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "", From 9d263433f401ad91facef54902322e3cdfb69bc9 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:26:12 +0200 Subject: [PATCH 20/26] remove CI_SYSTEM_LINK --- cli/exec/flags.go | 2 +- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 2 -- pipeline/frontend/metadata_test.go | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cli/exec/flags.go b/cli/exec/flags.go index 17f3ff4f172..b4692f46a13 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -110,7 +110,7 @@ var flags = []cli.Flag{ Value: "woodpecker", }, &cli.StringFlag{ - EnvVars: []string{"CI_SYSTEM_URL", "CI_SYSTEM_LINK"}, + EnvVars: []string{"CI_SYSTEM_URL"}, Name: "system-link", Value: "https://github.com/woodpecker-ci/woodpecker", }, diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index aafef0f6018..e62a705b86e 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -52,7 +52,6 @@ CI_STEP_STARTED=1685749339 CI_STEP_STATUS=success CI_SYSTEM_ARCH=linux/amd64 CI_SYSTEM_HOST=ci.codeberg.org -CI_SYSTEM_LINK=https://ci.codeberg.org CI_SYSTEM_NAME=woodpecker CI_SYSTEM_VERSION=next-dd644da3 CI_WORKFLOW_NAME=woodpecker diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 31c868dfc32..c0d1a1c36ff 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -114,8 +114,6 @@ func (m *Metadata) Environ() map[string]string { // DEPRECATED "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version - // use *_URL - "CI_SYSTEM_LINK": m.Sys.Link, } if m.Curr.Event == EventTag { params["CI_COMMIT_TAG"] = strings.TrimPrefix(m.Curr.Commit.Ref, "refs/tags/") diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 3fd47ad0bee..3823a2fecbe 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -81,7 +81,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_REMOTE_ID": "", "CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "", - "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_LINK": "", "CI_SYSTEM_NAME": "woodpecker", + "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "", "CI_WORKFLOW_NUMBER": "0", }, }, @@ -114,7 +114,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "", - "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_LINK": "https://example.com", + "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "https://example.com", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "hello", "CI_WORKFLOW_NUMBER": "0", }, }, From 452a2f7216bdb8ddb8b97c1be80ad746265f14c4 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:49:22 +0200 Subject: [PATCH 21/26] remove CI_SYSTEM_ARCH --- agent/tracer.go | 2 +- docs/docs/30-administration/22-backends/40-kubernetes.md | 2 +- .../30-administration/22-backends/40-kubernetes.md | 2 +- pipeline/backend/kubernetes/pod.go | 2 +- pipeline/frontend/metadata/drone_compatibility_test.go | 1 - pipeline/frontend/metadata/environment.go | 3 --- pipeline/frontend/metadata_test.go | 4 ++-- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/agent/tracer.go b/agent/tracer.go index 2740fb6f883..64633210f43 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -76,7 +76,7 @@ func (r *Runner) createTracer(ctxmeta context.Context, logger zerolog.Logger, wo state.Pipeline.Step.Environment["CI_STEP_STARTED"] = strconv.FormatInt(state.Pipeline.Time, 10) state.Pipeline.Step.Environment["CI_STEP_FINISHED"] = strconv.FormatInt(time.Now().Unix(), 10) - state.Pipeline.Step.Environment["CI_SYSTEM_ARCH"] = runtime.GOOS + "/" + runtime.GOARCH + state.Pipeline.Step.Environment["CI_SYSTEM_PLATFORM"] = runtime.GOOS + "/" + runtime.GOARCH if state.Pipeline.Error != nil { state.Pipeline.Step.Environment["CI_PIPELINE_STATUS"] = "failure" diff --git a/docs/docs/30-administration/22-backends/40-kubernetes.md b/docs/docs/30-administration/22-backends/40-kubernetes.md index 51c1958f794..9ab79b7e6f2 100644 --- a/docs/docs/30-administration/22-backends/40-kubernetes.md +++ b/docs/docs/30-administration/22-backends/40-kubernetes.md @@ -55,7 +55,7 @@ See the [kubernetes documentation](https://kubernetes.io/docs/concepts/security/ ### nodeSelector Specify the label which is used to select the node where the job should be executed. Labels defined here will be appended to a list already containing "kubernetes.io/arch". -By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_ARCH. To overwrite this, you need to specify this label in the nodeSelector section. +By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_PLATFORM. To overwrite this, you need to specify this label in the nodeSelector section. See the [kubernetes documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) for more information on using nodeSelector. Example pipeline configuration: diff --git a/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md b/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md index 51c1958f794..9ab79b7e6f2 100644 --- a/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md +++ b/docs/versioned_docs/version-1.0/30-administration/22-backends/40-kubernetes.md @@ -55,7 +55,7 @@ See the [kubernetes documentation](https://kubernetes.io/docs/concepts/security/ ### nodeSelector Specify the label which is used to select the node where the job should be executed. Labels defined here will be appended to a list already containing "kubernetes.io/arch". -By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_ARCH. To overwrite this, you need to specify this label in the nodeSelector section. +By default the pod will use "kubernetes.io/arch" inferred from top-level "platform" setting which is deducted from the agents' environment variable CI_SYSTEM_PLATFORM. To overwrite this, you need to specify this label in the nodeSelector section. See the [kubernetes documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) for more information on using nodeSelector. Example pipeline configuration: diff --git a/pipeline/backend/kubernetes/pod.go b/pipeline/backend/kubernetes/pod.go index 2d4b160d765..1ab91478aac 100644 --- a/pipeline/backend/kubernetes/pod.go +++ b/pipeline/backend/kubernetes/pod.go @@ -95,7 +95,7 @@ func Pod(namespace string, step *types.Step, labels, annotations map[string]stri labels["step"] = podName var nodeSelector map[string]string - platform, exist := step.Environment["CI_SYSTEM_ARCH"] + platform, exist := step.Environment["CI_SYSTEM_PLATFORM"] if exist && platform != "" { arch := strings.Split(platform, "/")[1] nodeSelector = map[string]string{v1.LabelArchStable: arch} diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index e62a705b86e..2323393ccd4 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -50,7 +50,6 @@ CI_STEP_FINISHED=1685749350 CI_STEP_NAME=wp_01h1z7v5d1tskaqjexw0ng6w7d_0_step_3 CI_STEP_STARTED=1685749339 CI_STEP_STATUS=success -CI_SYSTEM_ARCH=linux/amd64 CI_SYSTEM_HOST=ci.codeberg.org CI_SYSTEM_NAME=woodpecker CI_SYSTEM_VERSION=next-dd644da3 diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index c0d1a1c36ff..6827b35a16b 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -111,9 +111,6 @@ func (m *Metadata) Environ() map[string]string { "CI_FORGE_TYPE": m.Forge.Type, "CI_FORGE_URL": m.Forge.URL, - - // DEPRECATED - "CI_SYSTEM_ARCH": m.Sys.Platform, // TODO: remove after v1.0.x version } if m.Curr.Event == EventTag { params["CI_COMMIT_TAG"] = strings.TrimPrefix(m.Curr.Commit.Ref, "refs/tags/") diff --git a/pipeline/frontend/metadata_test.go b/pipeline/frontend/metadata_test.go index 3823a2fecbe..f381c0cefbc 100644 --- a/pipeline/frontend/metadata_test.go +++ b/pipeline/frontend/metadata_test.go @@ -81,7 +81,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_PIPELINE_DEPLOY_TARGET": "", "CI_PREV_PIPELINE_EVENT": "", "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "0", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "", "CI_REPO_CLONE_URL": "", "CI_REPO_DEFAULT_BRANCH": "", "CI_REPO_REMOTE_ID": "", "CI_REPO_NAME": "", "CI_REPO_OWNER": "", "CI_REPO_PRIVATE": "false", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "", "CI_STEP_FINISHED": "", - "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_NAME": "woodpecker", + "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_HOST": "", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "", "CI_WORKFLOW_NUMBER": "0", }, }, @@ -114,7 +114,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_STATUS": "", "CI_PREV_PIPELINE_URL": "", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", "CI_REPO_REMOTE_ID": "", "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_FINISHED": "", - "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_ARCH": "", "CI_SYSTEM_HOST": "example.com", + "CI_STEP_NAME": "", "CI_STEP_NUMBER": "0", "CI_STEP_STARTED": "", "CI_STEP_STATUS": "", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_PLATFORM": "", "CI_SYSTEM_URL": "https://example.com", "CI_SYSTEM_VERSION": "", "CI_WORKFLOW_NAME": "hello", "CI_WORKFLOW_NUMBER": "0", }, }, From b5dac1e6c19d376a10f09d947ebd4a537218dc17 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 00:53:20 +0200 Subject: [PATCH 22/26] docs: frontport --- docs/docs/20-usage/50-environment.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/20-usage/50-environment.md b/docs/docs/20-usage/50-environment.md index cb2bf236213..fd3100782ef 100644 --- a/docs/docs/20-usage/50-environment.md +++ b/docs/docs/20-usage/50-environment.md @@ -65,8 +65,8 @@ This is the reference list of all environment variables available to your pipeli | `CI_COMMIT_REF` | commit ref | | `CI_COMMIT_REFSPEC` | commit ref spec | | `CI_COMMIT_BRANCH` | commit branch (equals target branch for pull requests) | -| `CI_COMMIT_SOURCE_BRANCH` | commit source branch | -| `CI_COMMIT_TARGET_BRANCH` | commit target branch | +| `CI_COMMIT_SOURCE_BRANCH` | commit source branch (empty if event is not `pull_request`) | +| `CI_COMMIT_TARGET_BRANCH` | commit target branch (empty if event is not `pull_request`) | | `CI_COMMIT_TAG` | commit tag name (empty if event is not `tag`) | | `CI_COMMIT_PULL_REQUEST` | commit pull request number (empty if event is not `pull_request`) | | `CI_COMMIT_PULL_REQUEST_LABELS` | labels assigned to pull request (empty if event is not `pull_request`) | From e4f99446ffa35a11d1044a26474f8a67621c8830 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 14:03:00 +0200 Subject: [PATCH 23/26] replace and sort --- pipeline/samples/sample_1/.env | 26 +++++++++++------------ pipeline/samples/sample_10_windows/.env | 26 +++++++++++------------ pipeline/samples/sample_2/.env | 26 +++++++++++------------ pipeline/samples/sample_3/.env | 26 +++++++++++------------ pipeline/samples/sample_4/.env | 26 +++++++++++------------ pipeline/samples/sample_5/.env | 26 +++++++++++------------ pipeline/samples/sample_6/.env | 28 ++++++++++++------------- pipeline/samples/sample_9_cache/.env | 27 ++++++++++++------------ 8 files changed, 105 insertions(+), 106 deletions(-) diff --git a/pipeline/samples/sample_1/.env b/pipeline/samples/sample_1/.env index c6c64ae6937..2a6815f9200 100644 --- a/pipeline/samples/sample_1/.env +++ b/pipeline/samples/sample_1/.env @@ -1,16 +1,16 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski +CI_REPO_URL=https://github.com/drone/envsubst diff --git a/pipeline/samples/sample_10_windows/.env b/pipeline/samples/sample_10_windows/.env index c6c64ae6937..2a6815f9200 100644 --- a/pipeline/samples/sample_10_windows/.env +++ b/pipeline/samples/sample_10_windows/.env @@ -1,16 +1,16 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski +CI_REPO_URL=https://github.com/drone/envsubst diff --git a/pipeline/samples/sample_2/.env b/pipeline/samples/sample_2/.env index 41db77b7183..60e404e5799 100644 --- a/pipeline/samples/sample_2/.env +++ b/pipeline/samples/sample_2/.env @@ -1,16 +1,16 @@ +CI_COMMIT_AUTHOR=egorsmkv +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="Fix many urls" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=2e00b5cd70399450106cec6431c2e2ce3cae5034 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=530 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=go-sql-driver/mysql +CI_REPO_CLONE_URL=https://github.com/go-sql-driver/mysql.git CI_REPO_NAME=go-sql-driver/mysql -CI_REPO_LINK=https://github.com/go-sql-driver/mysql -CI_REPO_REMOTE=https://github.com/go-sql-driver/mysql.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=530 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=2e00b5cd70399450106cec6431c2e2ce3cae5034 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="Fix many urls" -CI_COMMIT_AUTHOR=egorsmkv +CI_REPO_URL=https://github.com/go-sql-driver/mysql diff --git a/pipeline/samples/sample_3/.env b/pipeline/samples/sample_3/.env index c6c64ae6937..2a6815f9200 100644 --- a/pipeline/samples/sample_3/.env +++ b/pipeline/samples/sample_3/.env @@ -1,16 +1,16 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski +CI_REPO_URL=https://github.com/drone/envsubst diff --git a/pipeline/samples/sample_4/.env b/pipeline/samples/sample_4/.env index c6c64ae6937..2a6815f9200 100644 --- a/pipeline/samples/sample_4/.env +++ b/pipeline/samples/sample_4/.env @@ -1,16 +1,16 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski +CI_REPO_URL=https://github.com/drone/envsubst diff --git a/pipeline/samples/sample_5/.env b/pipeline/samples/sample_5/.env index c6c64ae6937..2a6815f9200 100644 --- a/pipeline/samples/sample_5/.env +++ b/pipeline/samples/sample_5/.env @@ -1,16 +1,16 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski +CI_REPO_URL=https://github.com/drone/envsubst diff --git a/pipeline/samples/sample_6/.env b/pipeline/samples/sample_6/.env index 24093cb5be6..a10af139f4e 100644 --- a/pipeline/samples/sample_6/.env +++ b/pipeline/samples/sample_6/.env @@ -1,24 +1,24 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski +CI_REPO_URL=https://github.com/drone/envsubst # custom secrets SLACK_WEBHOOK=https://slack.com/hooks/xxxxxxxx/yyyyyyyyy # registry secrets CI_REGISTRY_HOSTNAME=docker.io -CI_REGISTRY_USERNAME=gordon CI_REGISTRY_PASSWORD=password +CI_REGISTRY_USERNAME=gordon diff --git a/pipeline/samples/sample_9_cache/.env b/pipeline/samples/sample_9_cache/.env index 75b20778ef6..5d630c59bb0 100644 --- a/pipeline/samples/sample_9_cache/.env +++ b/pipeline/samples/sample_9_cache/.env @@ -1,19 +1,18 @@ +CI_COMMIT_AUTHOR=bradrydzewski +CI_COMMIT_BRANCH=master +CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" +CI_COMMIT_REF=refs/heads/master +CI_COMMIT_REFSPEC= +CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 +CI_PIPELINE_CREATED=1486119586 +CI_PIPELINE_EVENT=push +CI_PIPELINE_NUMBER=6 +CI_PIPELINE_STARTED=1486119585 +CI_PIPELINE_URL= CI_REPO=drone/envsubst +CI_REPO_CLONE_URL=https://github.com/drone/envsubst.git CI_REPO_NAME=drone/envsubst -CI_REPO_LINK=https://github.com/drone/envsubst -CI_REPO_REMOTE=https://github.com/drone/envsubst.git CI_REPO_PRIVATE=false -CI_BUILD_NUMBER=6 -CI_BUILD_CREATED=1486119586 -CI_BUILD_STARTED=1486119585 -CI_BUILD_EVENT=push -CI_BUILD_LINK= -CI_COMMIT_SHA=d0876d3176965f9552a611cbd56e24a9264355e6 -CI_COMMIT_REF=refs/heads/master -CI_COMMIT_REFSPEC= -CI_COMMIT_BRANCH=master -CI_COMMIT_MESSAGE="added a few more test cases for escaping behavior" -CI_COMMIT_AUTHOR=bradrydzewski - +CI_REPO_URL=https://github.com/drone/envsubst CI_VOLUME_CACHE=true CI_VOLUME_CACHE_BASE=/cache/drone From 6597aba655e7232c9f321db21d33059e961969ee Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 14:06:19 +0200 Subject: [PATCH 24/26] update missed one --- pipeline/schema/.woodpecker/test-when.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/schema/.woodpecker/test-when.yml b/pipeline/schema/.woodpecker/test-when.yml index 78f53e790a3..fc820bcd85b 100644 --- a/pipeline/schema/.woodpecker/test-when.yml +++ b/pipeline/schema/.woodpecker/test-when.yml @@ -146,4 +146,4 @@ steps: commands: echo "test" when: - event: push - evaluate: 'CI_BUILD_EVENT == "push" && CI_REPO == "owner/repo"' + evaluate: 'CI_PIPELINE_EVENT == "push" && CI_REPO == "owner/repo"' From 94716df58b0ab674ac2bdfb037f5b27629b3589a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 14:09:22 +0200 Subject: [PATCH 25/26] add --- pipeline/frontend/metadata/drone_compatibility_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index 2323393ccd4..73efb0d3db6 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -50,6 +50,7 @@ CI_STEP_FINISHED=1685749350 CI_STEP_NAME=wp_01h1z7v5d1tskaqjexw0ng6w7d_0_step_3 CI_STEP_STARTED=1685749339 CI_STEP_STATUS=success +CI_SYSTEM_PLATFORM=linux/amd64 CI_SYSTEM_HOST=ci.codeberg.org CI_SYSTEM_NAME=woodpecker CI_SYSTEM_VERSION=next-dd644da3 From 14bd85031ed78db75bb030f4655fd8d9e2ee9bd6 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 28 Jul 2023 14:11:54 +0200 Subject: [PATCH 26/26] add notes in docs --- docs/docs/91-migrations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md index 1cb3d3b6855..f4ceb620798 100644 --- a/docs/docs/91-migrations.md +++ b/docs/docs/91-migrations.md @@ -2,9 +2,9 @@ Some versions need some changes to the server configuration or the pipeline configuration files. -## next +## next (1.1.0) -No breaking changes +- Drop deprecated `CI_BUILD_*`, `CI_PREV_BUILD_*`, `CI_JOB_*`, `*_LINK`, `CI_SYSTEM_ARCH`, `CI_REPO_REMOTE` built-in environment variables ## 1.0.0