Fix sbom naming

puzzle · Jan 9, 2024 · 19e00f7 · 19e00f7
1 parent 49e527c
commit 19e00f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/build-on-push.yaml b/.github/workflows/build-on-push.yaml
@@ -32,8 +32,8 @@ jobs:
     needs: build-int
     uses: ./.github/workflows/reusable-sbom.yaml
     with:
-      environment: pitc-ptime-int
       project_name: pitc-ptime-int
+      artifact-prefix: int-
     secrets:
       dependency_track_url: ${{ secrets.DEPTRACK_URL }}
       dependency_track_api_key: ${{ secrets.DEPTRACK_API_KEY }}
@@ -54,8 +54,8 @@ jobs:
     needs: build-prod
     uses: ./.github/workflows/reusable-sbom.yaml
     with:
-      environment: pitc-ptime-prod
       project_name: pitc-ptime-prod
+      artifact-prefix: prod-
     secrets:
       dependency_track_url: ${{ secrets.DEPTRACK_URL }}
       dependency_track_api_key: ${{ secrets.DEPTRACK_API_KEY }}
@@ -76,8 +76,8 @@ jobs:
     needs: build-pude
     uses: ./.github/workflows/reusable-sbom.yaml
     with:
-      environment: pude-ptime-prod
       project_name: pude-ptime-prod
+      artifact-prefix: pude-
     secrets:
       dependency_track_url: ${{ secrets.DEPTRACK_URL }}
       dependency_track_api_key: ${{ secrets.DEPTRACK_API_KEY }}
diff --git a/.github/workflows/reusable-sbom.yaml b/.github/workflows/reusable-sbom.yaml
@@ -3,14 +3,14 @@ name: Generate and push an SBOM dependency list
 on:
   workflow_call:
     inputs:
-      environment:
-        type: string
-        description: "Environment to build in"
-        required: true
       project_name:
         type: string
         description: "Project name to report to dependency track"
         required: true
+      artifact-prefix:
+        type: string
+        description: "what to prefix the artifacts with e.g. int-"
+        default: ""
 
     secrets:
       dependency_track_url:
@@ -23,7 +23,6 @@ on:
 jobs:
   generate-and-push-sbom:
     runs-on: 'ubuntu-latest'
-    environment: ${{ inputs.environment }}
     env:
       HEADLESS: true
       RAILS_TEST_DB_NAME: 'postgres'
@@ -82,7 +81,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: sboms
+          name: ${{ inputs.artifact-prefix }}sboms
           path: |
             ./sbom-npm.xml
             ./sbom-ruby.xml