Skip to content

Commit 6fbe688

Browse files
committed
merge main
2 parents fedf92b + 3aff6e6 commit 6fbe688

File tree

376 files changed

+21216
-10882
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+21216
-10882
lines changed

.config/nextest.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# The required version should be bumped up if we need new features, performance
55
# improvements or bugfixes that are present in newer versions of nextest.
6-
nextest-version = { required = "0.9.91", recommended = "0.9.91" }
6+
nextest-version = { required = "0.9.91", recommended = "0.9.96" }
77

88
experimental = ["setup-scripts"]
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ target_os=$1
1818
# NOTE: This version should be in sync with the recommended version in
1919
# .config/nextest.toml. (Maybe build an automated way to pull the recommended
2020
# version in the future.)
21-
NEXTEST_VERSION='0.9.91'
21+
NEXTEST_VERSION='0.9.96'
2222

2323
cargo --version
2424
rustc --version

.github/buildomat/jobs/tuf-repo.sh

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#: "=/work/manifest.toml",
99
#: "=/work/repo.zip",
1010
#: "=/work/repo.zip.sha256.txt",
11+
#: "=/work/helios.json",
12+
#: "=/work/incorporation.p5m",
13+
#: "=/work/incorporation.p5p",
1114
#: "%/work/*.log",
1215
#: ]
1316
#: access_repos = [
@@ -42,6 +45,21 @@
4245
#: name = "repo.zip.sha256.txt"
4346
#: from_output = "/work/repo.zip.sha256.txt"
4447
#:
48+
#: [[publish]]
49+
#: series = "rot-all"
50+
#: name = "helios.json"
51+
#: from_output = "/work/helios.json"
52+
#:
53+
#: [[publish]]
54+
#: series = "rot-all"
55+
#: name = "incorporation.p5m"
56+
#: from_output = "/work/incorporation.p5m"
57+
#:
58+
#: [[publish]]
59+
#: series = "rot-all"
60+
#: name = "incorporation.p5m"
61+
#: from_output = "/work/incorporation.p5p"
62+
#:
4563

4664
set -o errexit
4765
set -o pipefail
@@ -73,4 +91,4 @@ esac
7391
pfexec zfs create -p "rpool/images/$USER/host"
7492
pfexec zfs create -p "rpool/images/$USER/recovery"
7593

76-
cargo xtask releng --output-dir /work
94+
cargo xtask releng --output-dir /work --mkincorp

0 commit comments

Comments
 (0)