From 58fce8e683f18d9244b466210cfb0d2ab53a49cd Mon Sep 17 00:00:00 2001
From: Eero Laine <eero-veikko.laine@eficode.com>
Date: Wed, 2 Oct 2024 16:45:21 +0300
Subject: [PATCH] PGSSD-19 Running d-track step in the beginning, filepath
 edited.

---
 .github/workflows/build-and-test-on-pr.yml | 24 ++++++++++++----------
 package.json                               |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-and-test-on-pr.yml b/.github/workflows/build-and-test-on-pr.yml
index 06d09fb..5361a2a 100644
--- a/.github/workflows/build-and-test-on-pr.yml
+++ b/.github/workflows/build-and-test-on-pr.yml
@@ -26,6 +26,19 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
+      - name: Create BOM
+        run: npm run bom
+
+      - name: Upload BOM to Dependency-Track
+        uses: DependencyTrack/gh-upload-sbom@v3
+        with:
+          serverHostname: 'https://dtrack.dev.eficode.io/'
+          apiKey: ${{ secrets.DEPENDENCYTRACK_APIKEY }}
+          projectName: 'Pipeline_game'
+          projectVersion: 'main'
+          bomFilename: "bom.xml"
+          autoCreate: true
+
       - name: Bootstrap
         run: npm run bootstrap
 
@@ -98,17 +111,6 @@ jobs:
           name: cypress-videos
           path: packages/game-app/cypress/videos
 
-      - name: Create BOM
-        run: npm run bom
 
-      - name: Upload BOM to Dependency-Track
-        uses: DependencyTrack/gh-upload-sbom@v3
-        with:
-          serverHostname: 'https://dtrack.dev.eficode.io/'
-          apiKey: ${{ secrets.DEPENDENCYTRACK_APIKEY }}
-          projectName: 'Pipeline_game'
-          projectVersion: 'main'
-          bomFilename: "$DIR/bom.xml"
-          autoCreate: true
 
 
diff --git a/package.json b/package.json
index d36fd8c..c6de81f 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "scripts:deploy-database-instances-rules": "node scripts/deploy-rules-to-rtdb-instances.js",
     "scripts:load-initial-data:local": "npx env-cmd -f .env node scripts/load-initial-data.js",
     "version-and-release": "npx lerna version --create-release github",
-    "bom": "cyclonedx-npm --output-format 'XML' --output-file bom.xml"
+    "bom": "cyclonedx-npm --output-format XML --output-file bom.xml"
   },
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",