diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d47508a..4771cd7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: run: | app_version=$(yq '.version' rockcraft.yaml) version=$(yq '(.version|split("-"))[0]' rockcraft.yaml) - base=$(yq '(.base|split(":"))[1]' rockcraft.yaml) + base=$(yq '(.base|split("@"))[1]' rockcraft.yaml) tag=${version}-${base}_edge rockcraft pack mv charmed-mysql_${version}_amd64.rock charmed-mysql_${tag}_amd64.rock diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bd62edc..857614c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -42,7 +42,7 @@ jobs: run: | app=$(yq .name rockcraft.yaml) version=$(yq '(.version)' rockcraft.yaml) - base=$(yq '(.base|split(":"))[1]' rockcraft.yaml) + base=$(yq '(.base|split("@"))[1]' rockcraft.yaml) tag=${version}-${base}_edge sudo skopeo --insecure-policy copy \ oci-archive:${app}_${tag}_amd64.rock \ diff --git a/.github/workflows/sbom.yaml b/.github/workflows/sbom.yaml index 01691df..5ed05eb 100644 --- a/.github/workflows/sbom.yaml +++ b/.github/workflows/sbom.yaml @@ -18,7 +18,7 @@ jobs: - name: Set tag run: | version=$(yq '(.version|split("-"))[0]' rockcraft.yaml) - base=$(yq '(.base|split(":"))[1]' rockcraft.yaml) + base=$(yq '(.base|split("@"))[1]' rockcraft.yaml) echo "tag=${version}-${base}_edge" >> "$GITHUB_ENV" - uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml index 4bb77be..6e27c3b 100644 --- a/.github/workflows/trivy.yaml +++ b/.github/workflows/trivy.yaml @@ -26,7 +26,7 @@ jobs: run: | app=$(yq .name rockcraft.yaml) version=$(yq '(.version)' rockcraft.yaml) - base=$(yq '(.base|split(":"))[1]' rockcraft.yaml) + base=$(yq '(.base|split("@"))[1]' rockcraft.yaml) tag=${version}-${base}_edge sudo skopeo --insecure-policy copy \