Bump Syft to 0.32.0 (#158)

anchore · Dec 13, 2021 · 4da47ad · 4da47ad
1 parent b82b731
commit 4da47ad
Show file tree

Hide file tree

Showing 7 changed files with 450 additions and 447 deletions.
diff --git a/dist/attachReleaseAssets/index.js b/dist/attachReleaseAssets/index.js
diff --git a/dist/downloadSyft/index.js b/dist/downloadSyft/index.js
diff --git a/dist/runSyftAction/index.js b/dist/runSyftAction/index.js
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "package:release-action": "ncc build src/downloadSyft.ts -o dist/downloadSyft",
     "post-package:fix-line-endings": "eolConverter 'dist/**/*.js'",
     "test": "jest --collect-coverage",
+    "test:update-snapshots": "jest --updateSnapshot",
     "all": "npm run build && npm run format && npm run lint && npm run package && npm test",
     "prepare": "husky install",
     "prettier": "prettier -w src",

diff --git a/src/github/SyftGithubAction.ts b/src/github/SyftGithubAction.ts
@@ -15,7 +15,7 @@ import { SyftOptions } from "../Syft";
 import { dashWrap, debugLog, getClient } from "./GithubClient";
 
 export const SYFT_BINARY_NAME = "syft";
-export const SYFT_VERSION = "v0.26.0";
+export const SYFT_VERSION = "v0.32.0";
 
 const PRIOR_ARTIFACT_ENV_VAR = "ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT";
 

diff --git a/tests/integration/__snapshots__/snapshot.test.ts.snap b/tests/integration/__snapshots__/snapshot.test.ts.snap
diff --git a/tests/integration/snapshot.test.ts b/tests/integration/snapshot.test.ts
@@ -11,6 +11,7 @@ const testSource = async (source: string): Promise<string> => {
   let spdx = "";
   const artifacts: client.Artifact[] = [];
 
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
   (github as unknown).context = {
     eventName: "release",
@@ -76,12 +77,11 @@ const testSource = async (source: string): Promise<string> => {
     spyGetClient.mockRestore();
   }
 
-  // FIXME these tests are already flaky because SPDX format is not sorted currently
+  // Remove non-static data:
   return spdx
     .replace(/[Cc]reated["]?[:][^\n]+/g, "")
-    .split("\n")
-    .sort()
-    .join("\n");
+    .replace(/Creator[:][^\n]+/g, "")
+    .replace(/DocumentNamespace[:][^\n]+/g, "");
 };
 
 describe("SPDX", () => {