Merge branch 'master' into release

This commit is contained in:
Gus Eggert 2021-12-08 19:08:42 -05:00
commit 4a44edc9fa
No known key found for this signature in database
GPG Key ID: 08403467A64C485E
2 changed files with 51 additions and 13 deletions

View File

@ -72,11 +72,9 @@ jobs:
}
num_synced += 1
const github_assets = [];
github_map = {};
const github_assets = new Set()
for (const asset of release.assets) {
github_assets.push(asset.name);
github_map[asset.name] = true;
github_assets.add(asset.name)
}
// fetch asset info from dist.ipfs.io
@ -90,14 +88,14 @@ jobs:
}
await exec.exec('ipfs', ['ls', p], options)
const dist_assets = []
missing_files = []
const dist_assets = new Set()
const missing_files = []
for (const raw_line of stdout.split("\n")) {
line = raw_line.trim();
if (line.length != 0) {
file = line.split(/(\s+)/).filter( function(e) { return e.trim().length > 0; } )[2]
dist_assets.push(file)
if (!github_map[file]) {
dist_assets.add(file)
if (!github_assets.has(file)) {
missing_files.push(file)
}
}
@ -105,20 +103,60 @@ jobs:
// if dist.ipfs.io has files not found in github, copy them over
for (const file of missing_files) {
file_sha = file + ".sha512"
file_cid = file + ".cid"
// skip files that don't have .cid and .sha512 checksum files
if (!dist_assets.has(file_sha) || !dist_assets.has(file_cid)) {
if (!file.endsWith('.cid') && !file.endsWith('.sha512')) { // silent skip of .sha512.sha512 :)
console.log(`skipping "${file}" as dist.ipfs.io does not provide .cid and .sha512 checksum files for it`)
}
continue
}
console.log("fetching", file, "from dist.ipfs.io")
await exec.exec('ipfs', ['get', p + '/' + file])
const data = await fs.readFile(file, "binary")
await exec.exec('ipfs', ['get', p + '/' + file_sha])
await exec.exec('ipfs', ['get', p + '/' + file_cid])
console.log("verifying contents of", file)
// compute sha512 output for file
let sha_stdout = ''
const sha_options = {}
sha_options.listeners = {
stdout: (data) => {
sha_stdout += data.toString();
}
}
await exec.exec('sha512sum', [file], sha_options)
// read expected sha512 output
const sha_data = await fs.readFile(file_sha, "utf8")
const digest = (s) => s.split(' ').shift()
if (digest(sha_data) != digest(sha_stdout)) {
console.log(`${file}.sha512: ${sha_data}`)
console.log(`sha512sum ${file}: ${sha_stdout}`)
throw "checksum verification failed for " + file
}
console.log("uploading", file, "to github release", release.tag_name)
resp = await github.repos.uploadReleaseAsset({
const uploadReleaseAsset = async (file) => github.repos.uploadReleaseAsset({
owner: context.repo.owner,
repo: context.repo.repo,
release_id: release.id,
headers: {
"content-type": "application/octet-stream",
"content-length": `${(await fs.stat(file)).size}`
},
name: file,
data: data,
data: await fs.readFile(file)
})
await uploadReleaseAsset(file)
await uploadReleaseAsset(file_sha)
await uploadReleaseAsset(file_cid)
}
// summary of assets on both sides
release_assets.push({ tag: release.tag_name, github_assets: github_assets, dist_assets: dist_assets })
release_assets.push({ tag: release.tag_name, github_assets, dist_assets })
}
console.log(release_assets)
return release_assets

View File

@ -4,7 +4,7 @@ package ipfs
var CurrentCommit string
// CurrentVersionNumber is the current application's version literal
const CurrentVersionNumber = "0.11.0"
const CurrentVersionNumber = "0.12.0-dev"
const ApiVersion = "/go-ipfs/" + CurrentVersionNumber + "/"