Fix publishing

canonical · Nov 27, 2023 · 1a35fdf · 1a35fdf
1 parent d603c5f
commit 1a35fdf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -44,6 +44,6 @@ jobs:
           base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
           tag=${version}-${base}_edge
           sudo skopeo --insecure-policy copy \
-            oci-archive:charmed-postgresql_${tag}_amd64.rock \
+            oci-archive:charmed-postgresql_${version}_amd64.rock \
             docker-daemon:ghcr.io/canonical/charmed-postgresql:${tag}
           docker push ghcr.io/canonical/charmed-postgresql:${tag}
diff --git a/.github/workflows/sbom.yaml b/.github/workflows/sbom.yaml
@@ -19,13 +19,12 @@ jobs:
         run: |
           version=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
           base=$(yq '(.base|split(":"))[1]' rockcraft.yaml)
-          echo "tag=${version}-${base}_edge" >> "$GITHUB_ENV"
           echo "version=${version}" >> "$GITHUB_ENV"
       - uses: actions/download-artifact@v3
         with:
           name: postgresql-rock
       - name: Create SBOM
-        run: syft charmed-postgresql_${{env.version}}_amd64.rock -o spdx-json=charmed-postgresql_${{env.tag}}_amd64.rock.spdx.json
+        run: syft charmed-postgresql_${{env.version}}_amd64.rock -o spdx-json=charmed-postgresql_${{env.version}}_amd64.rock.spdx.json
       - name: Upload SBOM
         uses: actions/upload-artifact@v3
         with: