Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
catladder
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
catladder
catladder
Compare revisions
v1.146.0 to v1.146.1
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
catladder/catladder
Select target project
No results found
v1.146.1
Select Git revision
Swap
Target
catladder/catladder
Select target project
catladder/catladder
1 result
v1.146.0
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
style(pipeline): cosmetic order of generated pipeline yaml files
· 93f3e75d
Kaspar Vollenweider
authored
8 months ago
93f3e75d
chore(release): 1.146.1
· f351fad0
semantic-release-bot
authored
8 months ago
## [1.146.1](
v1.146.0...v1.146.1
) (2024-06-14)
f351fad0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+2
-0
2 additions, 0 deletions
CHANGELOG.md
pipeline/src/pipeline/generatePipelineFiles.ts
+20
-11
20 additions, 11 deletions
pipeline/src/pipeline/generatePipelineFiles.ts
with
22 additions
and
11 deletions
CHANGELOG.md
View file @
f351fad0
## [1.146.1](https://git.panter.ch/catladder/catladder/compare/v1.146.0...v1.146.1) (2024-06-14)
# [1.146.0](https://git.panter.ch/catladder/catladder/compare/v1.145.0...v1.146.0) (2024-06-14)
...
...
This diff is collapsed.
Click to expand it.
pipeline/src/pipeline/generatePipelineFiles.ts
View file @
f351fad0
...
...
@@ -11,19 +11,28 @@ export async function generatePipelineFiles<T extends PipelineType>(
if
(
mode
===
"
childpipeline
"
)
{
const
trigger
=
getPipelineTriggerForGitlabChildPipeline
();
const
{
jobs
,
...
mainPipeline
}
=
await
createChildPipeline
(
pipelineType
,
trigger
,
config
,
);
const
{
jobs
,
image
,
stages
,
variables
,
workflow
,
...
mainPipeline
}
=
await
createChildPipeline
(
pipelineType
,
trigger
,
config
);
// need to spread out the jobs, forgot why
await
writeYamlfile
(
`__pipeline.yml`
,
{
...
jobs
,
...
mainPipeline
});
await
writeYamlfile
(
`__pipeline.yml`
,
{
image
,
stages
,
variables
,
workflow
,
...
mainPipeline
,
...
jobs
,
});
}
else
{
const
{
jobs
,
...
mainPipeline
}
=
await
createMainPipeline
(
pipelineType
,
config
,
);
const
{
jobs
,
image
,
stages
,
variables
,
workflow
,
...
mainPipeline
}
=
await
createMainPipeline
(
pipelineType
,
config
);
// need to spread out the jobs, forgot why
await
writeYamlfile
(
`.gitlab-ci.yml`
,
{
...
jobs
,
...
mainPipeline
});
await
writeYamlfile
(
`.gitlab-ci.yml`
,
{
image
,
stages
,
variables
,
workflow
,
...
mainPipeline
,
...
jobs
,
});
}
}
This diff is collapsed.
Click to expand it.