Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ else
bootstrap_staging=$(mktemp "$bootstrap_cache/download.XXXXXX")
trap 'rm -f "$bootstrap_staging"' EXIT
curl --fail --location --proto '=https' --tlsv1.2 --silent --show-error \
https://github.com/UOR-Foundation/prismpm/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz \
https://github.com/UOR-Foundation/PrismPM/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz \
--output "$bootstrap_staging"
printf '%s %s\n' "$bootstrap_sha" "$bootstrap_staging" | sha256sum --check --strict
chmod 0444 "$bootstrap_staging"
Expand Down
4 changes: 2 additions & 2 deletions scripts/sdk-image-inputs.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function inputPolicy(source, revision) {
const bootstrap = Object.fromEntries(fields.map(row => [row[1], row[2]]));
keys(bootstrap, ['version', 'source_commit', 'tag_object', 'url', 'sha256']);
assert.equal(bootstrap.version, '0.2.0');
assert.equal(bootstrap.url, 'https://github.com/UOR-Foundation/prismpm/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz');
assert.equal(bootstrap.url, 'https://github.com/UOR-Foundation/PrismPM/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz');
oid(bootstrap.source_commit); oid(bootstrap.tag_object); assert.match(bootstrap.sha256, /^[0-9a-f]{64}$/);
return { schema: 'prismpm/sdk-vv-input-policy/1', source_revision: revision,
historical_revision: bootstrap.source_commit, historical_tag: bootstrap.tag_object,
Expand Down Expand Up @@ -115,7 +115,7 @@ export function prepareImageInputs(source, revision, destination) {
const bootstrap = join(work, 'bootstrap.tar.gz');
acquisition('curl', ['--disable', '--proto', '=https', '--proto-redir', '=https', '--tlsv1.2', '--fail', '--location',
'--silent', '--show-error', '--max-time', '240', '--max-filesize', '67108864',
'https://github.com/UOR-Foundation/prismpm/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz', '--output', bootstrap], work);
'https://github.com/UOR-Foundation/PrismPM/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz', '--output', bootstrap], work);
return captureImageInputs({ source, revision, advisory, bootstrap, destination });
} finally { removeOwned(work, identity); }
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/sdk-image-inputs.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function fixture(t) {
writeFileSync(bootstrap, 'synthetic pinned transport bytes, NOT a historical SDK\n');
writeFileSync(join(source, 'tools.lock'), '[bootstrap-sdk]\nversion = "0.2.0"\n'
+ `source_commit = "${historical}"\ntag_object = "${tag}"\n`
+ 'url = "https://github.com/UOR-Foundation/prismpm/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz"\n'
+ 'url = "https://github.com/UOR-Foundation/PrismPM/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz"\n'
+ `sha256 = "${hash(readFileSync(bootstrap))}"\n`);
writeFileSync(join(source, 'sdk/vv-inputs.lock.json'), canonical({ schema: 'prismpm/sdk-image-input-authorities/1', advisory: {
url: 'https://github.com/RustSec/advisory-db', revision: git(advisory, 'rev-parse', 'HEAD'), tree: git(advisory, 'rev-parse', 'HEAD^{tree}') } }));
Expand Down
2 changes: 1 addition & 1 deletion scripts/sdk-vv-inputs.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ function sourcePins(root, policy) {
['source_commit', policy.historical_revision],
['tag_object', policy.historical_tag],
['sha256', policy.bootstrap_sha256],
['url', 'https://github.com/UOR-Foundation/prismpm/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz']
['url', 'https://github.com/UOR-Foundation/PrismPM/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz']
]) {
const matches = [...section.matchAll(new RegExp('^' + key + ' = "([^"\\r\\n]+)"\\r?$', 'gm'))];
assert.equal(matches.length, 1, 'one explicit bootstrap pin required');
Expand Down
2 changes: 1 addition & 1 deletion scripts/sdk-vv-inputs.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function fixture(t) {
'version = "0.2.0"',
`source_commit = "${historical}"`,
`tag_object = "${tag}"`,
'url = "https://github.com/UOR-Foundation/prismpm/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz"',
'url = "https://github.com/UOR-Foundation/PrismPM/releases/download/v0.2.0/prismpm-0.2.0-x86_64-unknown-linux-gnu.tar.gz"',
`sha256 = "${bootstrapSha}"`,
''
].join('\n'));
Expand Down
Loading