Skip to content

Commit 6019c64

Browse files
authored
switch from dendrite-os back to dendrite (#7894)
1 parent f349a0e commit 6019c64

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.github/buildomat/jobs/build-and-test-helios.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#: "!/var/tmp/omicron_tmp/rustc*",
1313
#: ]
1414
#: access_repos = [
15-
#: "oxidecomputer/dendrite-os"
15+
#: "oxidecomputer/dendrite"
1616
#: ]
1717
#:
1818
#: [[publish]]

.github/buildomat/jobs/build-and-test-linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#: "!/var/tmp/omicron_tmp/rustc*",
1313
#: ]
1414
#: access_repos = [
15-
#: "oxidecomputer/dendrite-os",
15+
#: "oxidecomputer/dendrite",
1616
#: ]
1717
#:
1818
#: [[publish]]

.github/reflector/update-dendrite.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ requires_token = true
1212
# Run in response to the image buildomat job in dendrite completing
1313

1414
[[on]]
15-
repository = "oxidecomputer/dendrite-os"
15+
repository = "oxidecomputer/dendrite"
1616
event = "check_run"
1717
action = "completed"
1818
check = "image"

dev-tools/downloader/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ impl Downloader<'_> {
664664
get_values_from_file(["COMMIT", "SHA2"], &checksums_path).await?;
665665

666666
let url = format!(
667-
"{BUILDOMAT_URL}/oxidecomputer/dendrite-os/openapi/{commit}/dpd.json"
667+
"{BUILDOMAT_URL}/oxidecomputer/dendrite/openapi/{commit}/dpd.json"
668668
);
669669
let path = download_dir.join(format!("dpd-{commit}.json"));
670670

@@ -708,7 +708,7 @@ impl Downloader<'_> {
708708

709709
let tarball_file = "dendrite-stub.tar.gz";
710710
let tarball_path = download_dir.join(tarball_file);
711-
let repo = "oxidecomputer/dendrite-os";
711+
let repo = "oxidecomputer/dendrite";
712712
let url_base = format!("{BUILDOMAT_URL}/{repo}/image/{commit}");
713713

714714
tokio::fs::create_dir_all(&download_dir).await?;

dev-tools/ls-apis/src/cargo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,11 +420,11 @@ fn dendrite_workaround(
420420
cmd.env("CARGO_NET_GIT_FETCH_WITH_CLI", "true");
421421
cmd.env(
422422
format!("GIT_CONFIG_KEY_{count}"),
423-
"[email protected]:oxidecomputer/dendrite-os.insteadOf",
423+
"[email protected]:oxidecomputer/dendrite.insteadOf",
424424
);
425425
cmd.env(
426426
format!("GIT_CONFIG_VALUE_{count}"),
427-
"https://github.com/oxidecomputer/dendrite-os",
427+
"https://github.com/oxidecomputer/dendrite",
428428
);
429429
cmd.env("GIT_CONFIG_COUNT", (count + 1).to_string());
430430
cmd.exec().map_err(|err| {

package-manifest.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ only_for_targets.image = "standard"
719719
# 3. Change the below `source.type` key to `"manual"` and comment out or remove
720720
# the other `source.*` keys.
721721
source.type = "prebuilt"
722-
source.repo = "dendrite-os"
722+
source.repo = "dendrite"
723723
source.commit = "668f1a2e35e7c76b22ab83fe6c2242d3454e2803"
724724
source.sha256 = "b3372ddd22c54d70188e6a8526a65c5249000c21c64384c60914259cc4efd445"
725725
output.type = "zone"
@@ -746,7 +746,7 @@ only_for_targets.image = "standard"
746746
# 3. Change the below `source.type` key to `"manual"` and comment out or remove
747747
# the other `source.*` keys.
748748
source.type = "prebuilt"
749-
source.repo = "dendrite-os"
749+
source.repo = "dendrite"
750750
source.commit = "668f1a2e35e7c76b22ab83fe6c2242d3454e2803"
751751
source.sha256 = "da35769c141bbd45de20d4ab4716926eca9d18fa0877ebf509e53e1ed0e2e4ce"
752752
output.type = "zone"
@@ -766,7 +766,7 @@ only_for_targets.image = "standard"
766766
# 3. Change the below `source.type` key to `"manual"` and comment out or remove
767767
# the other `source.*` keys.
768768
source.type = "prebuilt"
769-
source.repo = "dendrite-os"
769+
source.repo = "dendrite"
770770
source.commit = "668f1a2e35e7c76b22ab83fe6c2242d3454e2803"
771771
source.sha256 = "14c18fde61837b161b48eae8a8af7bbd9e3c9758b723e8dff792466e7b0a30ea"
772772
output.type = "zone"

tools/update_dendrite.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PACKAGES=(
2121
"dendrite-stub"
2222
)
2323

24-
REPO="oxidecomputer/dendrite-os"
24+
REPO="oxidecomputer/dendrite"
2525

2626
. "$SOURCE_DIR/update_helpers.sh"
2727

0 commit comments

Comments
 (0)