reverse the upload order

This commit is contained in:
Conor Sloan
2024-08-22 20:30:50 +01:00
parent 028b950050
commit da1f4d6352
2 changed files with 18 additions and 18 deletions
Generated Vendored
+4 -4
View File
@@ -106885,10 +106885,6 @@ async function run() {
const archives = await fsHelper.createArchives(stagedActionFilesDir, archiveDir); const archives = await fsHelper.createArchives(stagedActionFilesDir, archiveDir);
const manifest = ociContainer.createActionPackageManifest(archives.tarFile, archives.zipFile, options.nameWithOwner, options.repositoryId, options.repositoryOwnerId, options.sha, semverTag.raw, new Date()); const manifest = ociContainer.createActionPackageManifest(archives.tarFile, archives.zipFile, options.nameWithOwner, options.repositoryId, options.repositoryOwnerId, options.sha, semverTag.raw, new Date());
const manifestDigest = ociContainer.sha256Digest(manifest); const manifestDigest = ociContainer.sha256Digest(manifest);
const publishedDigest = await publishImmutableActionVersion(options, semverTag.raw, archives.zipFile, archives.tarFile, manifest);
if (manifestDigest !== publishedDigest) {
throw new Error(`Unexpected digest returned for manifest. Expected ${manifestDigest}, got ${publishedDigest}`);
}
// Attestations are not supported in GHES. // Attestations are not supported in GHES.
if (!options.isEnterprise) { if (!options.isEnterprise) {
const { bundle, bundleDigest } = await generateAttestation(manifestDigest, semverTag.raw, options); const { bundle, bundleDigest } = await generateAttestation(manifestDigest, semverTag.raw, options);
@@ -106905,6 +106901,10 @@ async function run() {
core.setOutput('referrer-index-manifest-sha', referrerIndexSHA); core.setOutput('referrer-index-manifest-sha', referrerIndexSHA);
} }
} }
const publishedDigest = await publishImmutableActionVersion(options, semverTag.raw, archives.zipFile, archives.tarFile, manifest);
if (manifestDigest !== publishedDigest) {
throw new Error(`Unexpected digest returned for manifest. Expected ${manifestDigest}, got ${publishedDigest}`);
}
core.setOutput('package-manifest-sha', publishedDigest); core.setOutput('package-manifest-sha', publishedDigest);
} }
catch (error) { catch (error) {
+14 -14
View File
@@ -53,20 +53,6 @@ export async function run(): Promise<void> {
const manifestDigest = ociContainer.sha256Digest(manifest) const manifestDigest = ociContainer.sha256Digest(manifest)
const publishedDigest = await publishImmutableActionVersion(
options,
semverTag.raw,
archives.zipFile,
archives.tarFile,
manifest
)
if (manifestDigest !== publishedDigest) {
throw new Error(
`Unexpected digest returned for manifest. Expected ${manifestDigest}, got ${publishedDigest}`
)
}
// Attestations are not supported in GHES. // Attestations are not supported in GHES.
if (!options.isEnterprise) { if (!options.isEnterprise) {
const { bundle, bundleDigest } = await generateAttestation( const { bundle, bundleDigest } = await generateAttestation(
@@ -109,6 +95,20 @@ export async function run(): Promise<void> {
} }
} }
const publishedDigest = await publishImmutableActionVersion(
options,
semverTag.raw,
archives.zipFile,
archives.tarFile,
manifest
)
if (manifestDigest !== publishedDigest) {
throw new Error(
`Unexpected digest returned for manifest. Expected ${manifestDigest}, got ${publishedDigest}`
)
}
core.setOutput('package-manifest-sha', publishedDigest) core.setOutput('package-manifest-sha', publishedDigest)
} catch (error) { } catch (error) {
// Fail the workflow run if an error occurs // Fail the workflow run if an error occurs