From 3c0438861d3c651a1ebc19db3a621aa9df4a26fa Mon Sep 17 00:00:00 2001
From: Sam Baker <72452805+sbaker-devolutions@users.noreply.github.com>
Date: Fri, 25 Nov 2022 15:06:30 -0500
Subject: [PATCH] ci: fix upload to dtrack (SBOM) (#361)

---
 .github/workflows/package.yml |  2 +-
 .github/workflows/release.yml | 31 -------------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 79f38b0e7..bf3443247 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -370,7 +370,7 @@ jobs:
           path: devolutions-gateway/bom.xml
 
       - name: Upload SBOM to Dependency-Track
-        uses: ./.github/workflows/dtrack-upload-sbom@master
+        uses: ./.github/workflows/dtrack-upload-sbom
         with:
           serverhostname: 'dtrack-api.devolutions.com'
           apikey: ${{ secrets.DTRACK_AUTOMATION_API_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f1529b8e7..2046e367d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -340,37 +340,6 @@ jobs:
             }
           }
 
-  Upload-SBOM:
-    name: Upload SBOM
-    runs-on: ubuntu-latest
-    needs: preflight
-    if: needs.preflight.outputs.skip-publishing == 'false' || github.event.inputs.dry-run == 'false'
-
-    steps:
-      ## Download back the artifacts produced by the other jobs
-
-      - name: Download artifacts (action)
-        if: needs.preflight.outputs.dl-strategy == 'action'
-        uses: actions/download-artifact@v3
-        with:
-          name: bom.xml
-
-      - name: Download artifacts (cli)
-        if: needs.preflight.outputs.dl-strategy == 'cli'
-        shell: pwsh
-        env:
-          GITHUB_TOKEN: ${{ secrets.DEVOLUTIONSBOT_TOKEN }}
-        run: gh run download ${{ needs.preflight.outputs.run }} -n bom.xml --repo $Env:GITHUB_REPOSITORY
-
-      - name: Upload SBOM
-        uses: devolutions/actions/dtrack-upload-sbom@master
-        with:
-          serverhostname: dtrack-api.devolutions.com
-          apikey: ${{ secrets.DTRACK_AUTOMATION_API_KEY }}
-          projectname: devolutions-gateway
-          projectversion: ${{ needs.preflight.outputs.version }}
-          autocreate: 'true'
-
   onedrive:
     name: OneDrive
     runs-on: ubuntu-20.04