Maidn/maidn-cli
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: keep static builds off shared workspaces

Browse source
This commit is contained in:
eding 2026-09-13 15:46:35 +02:00
parent a867c209c3
commit bc166e4973
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/assets/templates/delivery-pipeline.yaml.tmpl
View file

@ -628,8 +628,6 @@ spec:
default: {{ quote .ForgejoOwner }} default: {{ quote .ForgejoOwner }}
- name: manifests-repo - name: manifests-repo
default: {{ quote .ManifestsRepo }} default: {{ quote .ManifestsRepo }}
workspaces:
- name: artifact
tasks: tasks:
- name: build-layer - name: build-layer
when: when:
@ -649,9 +647,6 @@ spec:
value: {{ quote .BuildOutputDirectory }} value: {{ quote .BuildOutputDirectory }}
- name: build-configuration - name: build-configuration
value: {{ quote .BuildConfiguration }} value: {{ quote .BuildConfiguration }}
workspaces:
- name: artifact
workspace: artifact
- name: update-preview - name: update-preview
runAfter: [build-layer] runAfter: [build-layer]
when: when:

4
internal/bootstrap/bootstrap_test.go
View file

@ -118,12 +118,12 @@ func TestGeneratedDeliveryUsesCombinedStaticBuildArtifactContract(t *testing.T)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
for _, expected := range []string{"name: build-layer", "maidn-node-static-image", "name: url\n value: \"https://git.example.test/apps/web-ui.git\"", "name: revision\n value: $(params.git-revision)", "name: image\n value: $(params.image)", "name: artifact\n workspace: artifact", "runAfter: [build-layer]", "maidn-preview-orphan-reconciler", "valid_pr_number()", "valid_commit()", "values: [promotion]", "values: [\"production\"]", "cmp -s \"$expected_marker\" \"$marker\"", "values: [closed]"} { for _, expected := range []string{"name: build-layer", "maidn-node-static-image", "name: url\n value: \"https://git.example.test/apps/web-ui.git\"", "name: revision\n value: $(params.git-revision)", "name: image\n value: $(params.image)", "runAfter: [build-layer]", "maidn-preview-orphan-reconciler", "valid_pr_number()", "valid_commit()", "values: [promotion]", "values: [\"production\"]", "cmp -s \"$expected_marker\" \"$marker\"", "values: [closed]"} {
if !strings.Contains(string(content), expected) { if !strings.Contains(string(content), expected) {
t.Fatalf("generated delivery does not contain %q", expected) t.Fatalf("generated delivery does not contain %q", expected)
} }
} }
for _, unexpected := range []string{"maidn-git-clone", "maidn-node-static-build", "maidn-node-static-push", "runAfter: [clone]", "name: source", "workspace: source", "easycsr", "test-org", "git rm -r"} { for _, unexpected := range []string{"maidn-git-clone", "maidn-node-static-build", "maidn-node-static-push", "runAfter: [clone]", "name: source", "workspace: source", "workspace: artifact", "easycsr", "test-org", "git rm -r"} {
if strings.Contains(string(content), unexpected) { if strings.Contains(string(content), unexpected) {
t.Fatalf("generated delivery contains unexpected %q", unexpected) t.Fatalf("generated delivery contains unexpected %q", unexpected)
} }