Skip to content

Commit 93897eb

Browse files
committed
fix test?
1 parent a0d2310 commit 93897eb

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

.github/buildomat/jobs/build-release.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ ptime -m cargo run --bin crucible-package
8686
banner contents
8787
tar tvfz out/crucible.tar.gz
8888
tar tvfz out/crucible-pantry.tar.gz
89-
tar tvfz out/crucible-svc.tar.gz
90-
tar tvfz out/crucible-pantry-svc.tar.gz
91-
mv out/crucible.tar.gz out/crucible-pantry.tar.gz out/crucible-svc.tar.gz out/crucible-pantry-svc.tar.gz /out/
89+
mv out/crucible.tar.gz out/crucible-pantry.tar.gz /out/
9290

9391
# Build the nightly archive file which should include all the scripts
9492
# and binaries needed to run the nightly test.

package-manifest.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
[package.crucible]
2-
service_name = "crucible"
3-
only_for_targets.image = "standard"
4-
source.type = "composite"
5-
source.packages = [ "crucible-svc.tar.gz", "zone-network-setup.tar.gz" ]
6-
output.type = "zone"
7-
81
[package.crucible-svc]
92
service_name = "crucible-svc"
103
source.type = "local"
@@ -17,11 +10,11 @@ source.paths = [
1710
output.type = "zone"
1811
output.intermediate_only = true
1912

20-
[package.crucible-pantry]
21-
service_name = "crucible-pantry"
13+
[package.crucible]
14+
service_name = "crucible"
2215
only_for_targets.image = "standard"
2316
source.type = "composite"
24-
source.packages = [ "crucible-pantry-svc.tar.gz", "zone-network-setup.tar.gz" ]
17+
source.packages = [ "crucible-svc.tar.gz", "zone-network-setup.tar.gz" ]
2518
output.type = "zone"
2619

2720
[package.crucible-pantry-svc]
@@ -34,3 +27,10 @@ source.paths = [
3427
]
3528
output.type = "zone"
3629
output.intermediate_only = true
30+
31+
[package.crucible-pantry]
32+
service_name = "crucible-pantry"
33+
only_for_targets.image = "standard"
34+
source.type = "composite"
35+
source.packages = [ "crucible-pantry-svc.tar.gz", "zone-network-setup.tar.gz" ]
36+
output.type = "zone"

0 commit comments

Comments
 (0)