Update SBOM workflow

canonical · Nov 27, 2023 · 528c498 · 528c498
1 parent aae0019
commit 528c498
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/sbom.yaml b/.github/workflows/sbom.yaml
@@ -15,18 +15,17 @@ jobs:
       - name: Install Syft
         run: |
           curl -sSfL https://raw.githubusercontent.com/anchore/syft/4fc17edd146af34ab06f5b0443ef8ddac3aaf076/install.sh | sh -s -- -b /usr/local/bin
-      - name: Set tag
+      - name: Set version
         run: |
           version=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
-          base=$(yq '(.base|split(":"))[1]' rockcraft.yaml)
-          echo "tag=${version}-${base}_edge" >> "$GITHUB_ENV"
+          echo "=${version}" >> "$GITHUB_ENV"
       - uses: actions/download-artifact@v3
         with:
           name: charmed-mysql-rock
       - name: Create SBOM
-        run: syft charmed-mysql_${{env.tag}}_amd64.rock -o spdx-json=charmed-mysql_${{env.tag}}_amd64.rock.spdx.json
+        run: syft charmed-mysql_${{env.version}}_amd64.rock -o spdx-json=charmed-mysql_${{env.version}}_amd64.rock.spdx.json
       - name: Upload SBOM
         uses: actions/upload-artifact@v3
         with:
-          path: "charmed-mysql_${{env.tag}}_amd64.rock.spdx.json"
-          name: charmed-mysql_${{env.tag}}_amd64.rock.spdx.json
+          path: "charmed-mysql_${{env.version}}_amd64.rock.spdx.json"
+          name: charmed-mysql_${{env.version}}_amd64.rock.spdx.json