Fix published file name (#31)

* Fix published artifact filename * Use a better variable name
canonical · Dec 5, 2023 · 75f92a3 · 75f92a3
1 parent 50f90ed
commit 75f92a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -39,10 +39,11 @@ jobs:
           password: ${{ secrets.GHCR_TOKEN }}
       - name: Import and push to GHCR
         run: |
-          version=$(yq '(.version)' rockcraft.yaml)
+          version=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
+          rock_image_version=$(yq '(.version)' rockcraft.yaml)
           base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
           tag=${version}-${base}_edge
           sudo skopeo --insecure-policy copy \
-            oci-archive:charmed-mongodb_${version}_amd64.rock \
+            oci-archive:charmed-mongodb_${rock_image_version}_amd64.rock \
             docker-daemon:ghcr.io/canonical/charmed-mongodb:${tag}
           docker push ghcr.io/canonical/charmed-mongodb:${tag}
diff --git a/.github/workflows/publish_beta.yaml b/.github/workflows/publish_beta.yaml
@@ -36,10 +36,11 @@ jobs:
           password: ${{ secrets.GHCR_TOKEN }}
       - name: Import and push to GHCR
         run: |
-          version=$(yq '(.version)' rockcraft.yaml)
+          version=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
+          rock_image_version=$(yq '(.version)' rockcraft.yaml)
           base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
           tag=${version}-${base}_beta
           sudo skopeo --insecure-policy copy \
-            oci-archive:charmed-mongodb_${version}_amd64.rock \
+            oci-archive:charmed-mongodb_${rock_image_version}_amd64.rock \
             docker-daemon:ghcr.io/canonical/charmed-mongodb:${tag}
           docker push ghcr.io/canonical/charmed-mongodb:${tag}