From b6c43a87c36470a146db657ee4dcd06dad3c8871 Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Fri, 24 Nov 2023 18:37:07 +0200 Subject: [PATCH 1/4] Fix build workflow --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0339d21..50ac398 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: version=$(yq '(.version|split("-"))[0]' rockcraft.yaml) base=$(yq '(.base|split(":"))[1]' rockcraft.yaml) tag=${version}-${base}_edge - sed -i "s/${app_version}/${tag}/g" rockcraft.yaml + sed -i "s/${app_version}/${base}/g" rockcraft.yaml rockcraft pack - name: Upload locally built ROCK artifact uses: actions/upload-artifact@v3 From 84a5638e0124ff011641b19cd542011cbf90b180 Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Fri, 24 Nov 2023 18:41:56 +0200 Subject: [PATCH 2/4] Update base field --- rockcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rockcraft.yaml b/rockcraft.yaml index e460291..485ffdb 100644 --- a/rockcraft.yaml +++ b/rockcraft.yaml @@ -1,5 +1,5 @@ name: charmed-postgresql # the name of your ROCK -base: ubuntu:22.04 # the base environment for this ROCK +base: ubuntu@22.04 # the base environment for this ROCK version: '14.9' # just for humans. Semantic versioning is recommended summary: PostgreSQL in a ROCK. # 79 char long summary description: | From 9da66c80d28d759d0c4fda917a34ce73d35f39af Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Fri, 24 Nov 2023 18:51:18 +0200 Subject: [PATCH 3/4] Split base on at --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 50ac398..b6564dc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,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 sed -i "s/${app_version}/${base}/g" rockcraft.yaml rockcraft pack From 946573ec3a9b79e79ff9c43d6484bf39121f96d9 Mon Sep 17 00:00:00 2001 From: Dragomir Penev Date: Mon, 27 Nov 2023 14:00:17 +0200 Subject: [PATCH 4/4] Remove autoupdate of rockcraft.yaml version --- .github/workflows/build.yaml | 8 +------- .github/workflows/publish.yaml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b6564dc..467326c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,13 +18,7 @@ jobs: sudo snap install yq sudo snap install rockcraft --classic --edge - name: Build ROCK - run: | - app_version=$(yq '.version' rockcraft.yaml) - version=$(yq '(.version|split("-"))[0]' rockcraft.yaml) - base=$(yq '(.base|split("@"))[1]' rockcraft.yaml) - tag=${version}-${base}_edge - sed -i "s/${app_version}/${base}/g" rockcraft.yaml - rockcraft pack + run: rockcraft pack - name: Upload locally built ROCK artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f35af01..6d56757 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -41,7 +41,7 @@ jobs: - name: Import and push to GHCR run: | 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 sudo skopeo --insecure-policy copy \ oci-archive:charmed-postgresql_${tag}_amd64.rock \