From 53396ce53d574df97bf3956d64a3e14a73762ec8 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Fri, 22 Aug 2025 10:16:21 +0200 Subject: [PATCH 1/4] fix shell --- .gitea/workflows/build-and-package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-package.yaml b/.gitea/workflows/build-and-package.yaml index 90e0389..c8b0d7e 100644 --- a/.gitea/workflows/build-and-package.yaml +++ b/.gitea/workflows/build-and-package.yaml @@ -35,7 +35,7 @@ jobs: steps: - name: Extract version run: | - VERSION="${GITEA_REFNAME#releases/} + VERSION="${GITEA_REFNAME#releases/}" echo "VERSION=$VERSION" >> $GITEA_OUTPUT echo "VERSION=$VERSION" >> $GITEA_ENV -- 2.49.1 From f7f8ae688eaa801ee8dc6155997f54f813849ee4 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Fri, 22 Aug 2025 10:21:24 +0200 Subject: [PATCH 2/4] wip(actions): fixing and add some information output --- .gitea/workflows/build-and-package.yaml | 1 + .gitea/workflows/build-oci.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-and-package.yaml b/.gitea/workflows/build-and-package.yaml index c8b0d7e..6d1ce55 100644 --- a/.gitea/workflows/build-and-package.yaml +++ b/.gitea/workflows/build-and-package.yaml @@ -61,6 +61,7 @@ jobs: - name: Compile binary if: matrix.goos == 'linux' || matrix.goos == 'freebsd' || matrix.goos == 'darwin' run: |- + echo "Building binary version $VERSION" mkdir -p dist GOARCH=${{ matrix.goarch }} GOOS=${{ matrix.goos }}\ go build -ldflags="-X 'repo.katenary.io/katenary/katenary/internal/generator.Version=$VERSION'" \ diff --git a/.gitea/workflows/build-oci.yaml b/.gitea/workflows/build-oci.yaml index 0e5d430..a041046 100644 --- a/.gitea/workflows/build-oci.yaml +++ b/.gitea/workflows/build-oci.yaml @@ -19,7 +19,7 @@ jobs: steps: - name: Extract version run: | - VERSION="${GITEA_REFNAME#releases/} + VERSION="${GITEA_REFNAME#releases/}" echo "VERSION=$VERSION" >> $GITEA_OUTPUT echo "VERSION=$VERSION" >> $GITEA_ENV @@ -42,6 +42,7 @@ jobs: - name: Build and tag run: |- + echo "Building image $REGISTRY/${IMAGE_NAME,,}:$VERSION / latest" buildah build --isolation=chroot --build-arg VERSION=$VERSION -t katenary -f ./oci/katenary/Containerfile . buildah tag katenary $REGISTRY/${IMAGE_NAME,,}:$VERSION buildah tag katenary $REGISTRY/${IMAGE_NAME,,}:latest -- 2.49.1 From d766e02bbbbe31caa2bf906b9f065b9ea6154f76 Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Fri, 22 Aug 2025 10:24:05 +0200 Subject: [PATCH 3/4] wip(actions): fixing and add some information output --- .gitea/workflows/build-and-package.yaml | 1 + .gitea/workflows/build-oci.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitea/workflows/build-and-package.yaml b/.gitea/workflows/build-and-package.yaml index 6d1ce55..4b2e224 100644 --- a/.gitea/workflows/build-and-package.yaml +++ b/.gitea/workflows/build-and-package.yaml @@ -36,6 +36,7 @@ jobs: - name: Extract version run: | VERSION="${GITEA_REFNAME#releases/}" + echo "Exporting variable VERSION=$VERSION" echo "VERSION=$VERSION" >> $GITEA_OUTPUT echo "VERSION=$VERSION" >> $GITEA_ENV diff --git a/.gitea/workflows/build-oci.yaml b/.gitea/workflows/build-oci.yaml index a041046..30963f7 100644 --- a/.gitea/workflows/build-oci.yaml +++ b/.gitea/workflows/build-oci.yaml @@ -20,6 +20,7 @@ jobs: - name: Extract version run: | VERSION="${GITEA_REFNAME#releases/}" + echo "Exporting variable VERSION=$VERSION" echo "VERSION=$VERSION" >> $GITEA_OUTPUT echo "VERSION=$VERSION" >> $GITEA_ENV -- 2.49.1 From e88c45f18406dca05264dae537e7997c1bf2b7ed Mon Sep 17 00:00:00 2001 From: Patrice Ferlet Date: Fri, 22 Aug 2025 10:26:04 +0200 Subject: [PATCH 4/4] Force variable... --- .gitea/workflows/build-and-package.yaml | 3 ++- .gitea/workflows/build-oci.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-and-package.yaml b/.gitea/workflows/build-and-package.yaml index 4b2e224..f1d7fb2 100644 --- a/.gitea/workflows/build-and-package.yaml +++ b/.gitea/workflows/build-and-package.yaml @@ -15,6 +15,7 @@ env: LICENSE: MIT DESCRIPTION: "Effortless conversion from compose files (docker, podman) to Helm Charts" URL: "https://katenary.io" + VERSION: ${{ gitea.ref_name }} jobs: build-packages: @@ -35,7 +36,7 @@ jobs: steps: - name: Extract version run: | - VERSION="${GITEA_REFNAME#releases/}" + VERSION="${VERSION#releases/}" echo "Exporting variable VERSION=$VERSION" echo "VERSION=$VERSION" >> $GITEA_OUTPUT echo "VERSION=$VERSION" >> $GITEA_ENV diff --git a/.gitea/workflows/build-oci.yaml b/.gitea/workflows/build-oci.yaml index 30963f7..a003b54 100644 --- a/.gitea/workflows/build-oci.yaml +++ b/.gitea/workflows/build-oci.yaml @@ -9,6 +9,7 @@ env: REGISTRY: repo.katenary.io IMAGE_NAME: ${{ gitea.repository }} STORAGE_DRIVER: vfs + VERSION: ${{ gitea.ref_name }} jobs: build: @@ -19,7 +20,7 @@ jobs: steps: - name: Extract version run: | - VERSION="${GITEA_REFNAME#releases/}" + VERSION="${VERSION#releases/}" echo "Exporting variable VERSION=$VERSION" echo "VERSION=$VERSION" >> $GITEA_OUTPUT echo "VERSION=$VERSION" >> $GITEA_ENV -- 2.49.1