|
| 1 | +From: =?utf-8?b?T3R0byBLZWvDpGzDpGluZW4=?= < [email protected]> |
| 2 | +Date: Thu, 15 May 2025 12:45:54 -0700 |
| 3 | +Subject: Use standard Salsa CI with standard settings instead of custom Go |
| 4 | + team CI |
| 5 | + |
| 6 | +Instead of having both the Go team custom CI and Salsa CI, simply use |
| 7 | +the default template with minimal customizations from |
| 8 | +https://salsa.debian.org/salsa-ci-team/pipeline/-/blob/master/recipes/salsa-ci.yml |
| 9 | + |
| 10 | +This simplifies the CI and continues to give the same benefits as before, |
| 11 | +as the Salsa CI pipeline jobs have made the custom Go team CI obsolete. |
| 12 | +--- |
| 13 | + template.go | 59 ++++++++++++++--------------------------------------------- |
| 14 | + 1 file changed, 14 insertions(+), 45 deletions(-) |
| 15 | + |
| 16 | +diff --git a/template.go b/template.go |
| 17 | +index 4e0d356..b1f6780 100644 |
| 18 | +--- a/template.go |
| 19 | ++++ b/template.go |
| 20 | +@@ -500,53 +500,22 @@ func writeDebianUpstreamMetadata(dir, gopkg string) error { |
| 21 | + } |
| 22 | + |
| 23 | + func writeDebianGitLabCI(dir string) error { |
| 24 | +- const gitlabciymlTmpl = `# DO NOT MODIFY |
| 25 | +-# This file was automatically generated from the authoritative copy at: |
| 26 | +-# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go |
| 27 | ++ const gitlabciymlTmpl = `# This is a template from |
| 28 | ++# https://salsa.debian.org/salsa-ci-team/pipeline/-/raw/master/recipes/salsa-ci.yml |
| 29 | ++# |
| 30 | ++# If this pipeline is not running at after committing and pushing this file, |
| 31 | ++# ensure that https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in |
| 32 | ++# field "CI/CD configuration file" filename "debian/salsa-ci.yml", the filename |
| 33 | ++# is the same as of this file, and duplicate files with similar contents but |
| 34 | ++# different filenames have been cleaned away. |
| 35 | ++# |
| 36 | ++# Feel free disable and enable tests to find a good balance between extensive |
| 37 | ++# coverage and having a consistently green pipeline where failures are rare |
| 38 | ++# enough that they are always investigated and addressed. For documentation |
| 39 | ++# please read https://salsa.debian.org/salsa-ci-team/pipeline |
| 40 | + --- |
| 41 | +-stages: |
| 42 | +- - test |
| 43 | +- - package |
| 44 | +- |
| 45 | + include: |
| 46 | +- - project: go-team/infra/pkg-go-tools |
| 47 | +- ref: master |
| 48 | +- file: pipeline/test-archive.yml |
| 49 | +- # Run the Go team CI only in the go-team project that has access to GitLab |
| 50 | +- # CI runners tagged 'go-ci' |
| 51 | +- rules: |
| 52 | +- - if: $CI_PROJECT_ROOT_NAMESPACE == "go-team" |
| 53 | +- |
| 54 | +-Salsa CI: |
| 55 | +- stage: package |
| 56 | +- trigger: |
| 57 | +- include: |
| 58 | +- - project: salsa-ci-team/pipeline |
| 59 | +- ref: master |
| 60 | +- file: recipes/debian.yml |
| 61 | +- strategy: depend |
| 62 | +- rules: |
| 63 | +- # Do not create a pipeline for tags unless SALSA_CI_ENABLE_PIPELINE_ON_TAGS is set |
| 64 | +- - if: $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/ |
| 65 | +- when: never |
| 66 | +- # Avoid duplicated pipelines, do not run detached pipelines |
| 67 | +- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' |
| 68 | +- when: never |
| 69 | +- # Run Salsa CI only if the Play button is pressed on the pipeline |
| 70 | +- - if: $CI_PIPELINE_SOURCE == "push" |
| 71 | +- when: manual |
| 72 | +- variables: |
| 73 | +- SALSA_CI_DISABLE_REPROTEST: 1 # Disable to save CI runner resources |
| 74 | +- |
| 75 | +-# If Salsa CI is not running at |
| 76 | +-# https://salsa.debian.org/%{project_path}/-/pipelines, ensure that |
| 77 | +-# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in field "CI/CD |
| 78 | +-# configuration file" the same filename as this file. |
| 79 | +-# |
| 80 | +-# If Salsa CI is running, but first job is stuck because the project doesn't |
| 81 | +-# have any runners online assigned to it, ensure that |
| 82 | +-# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has under "Runners" |
| 83 | +-# the setting for "Enable instance runners for this project" enabled. |
| 84 | ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml |
| 85 | + ` |
| 86 | + |
| 87 | + f, err := os.Create(filepath.Join(dir, "debian", "gitlab-ci.yml")) |
0 commit comments