From b321f72e263ec9f22a6c8c7afdae7ce2f3a7511e Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Fri, 24 Mar 2023 08:18:43 +0100
Subject: [PATCH] :arrow_up: Bump elemental (#160)

---
 packages/system/elemental/build.yaml      | 8 +++-----
 packages/system/elemental/definition.yaml | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/system/elemental/build.yaml b/packages/system/elemental/build.yaml
index 1cb23d9..379cbd2 100644
--- a/packages/system/elemental/build.yaml
+++ b/packages/system/elemental/build.yaml
@@ -5,17 +5,15 @@ requires:
 env:
 - PATH=$PATH:/usr/local/go/bin
 - CGO_ENABLED=0
-- PACKAGE_VERSION={{( index .Values.labels "git.hash" )}}
-- ORG={{( index .Values.labels "github.owner" )}}
 - REPO={{( index .Values.labels "github.repo" )}}
 
 prelude:
-- |
-   git clone https://github.com/$ORG/$REPO && cd $REPO && git checkout ${PACKAGE_VERSION} 
+- git clone https://github.com/{{( index .Values.labels "github.owner" )}}/$REPO && cd $REPO && git checkout {{( index .Values.labels "git.hash" )}}
 
 steps:
   - |
-    cd $REPO && make GIT_TAG={{.Values.version}}+kairos build && \
+    cd $REPO && GIT_COMMIT=$(git rev-parse HEAD) && GIT_TAG=$(git describe --abbrev=0 --tags 2>/dev/null) && \
+    go build -o bin/{{.Values.bin_name}} -ldflags "-s -w -X 'github.com/rancher/elemental-cli/internal/version.version=${GIT_TAG}' -X 'github.com/rancher/elemental-cli/internal/version.gitCommit=${GIT_COMMIT}'" && \
     mv bin/{{.Values.bin_name}} /usr/bin/{{.Values.bin_name}}
 
 includes:
diff --git a/packages/system/elemental/definition.yaml b/packages/system/elemental/definition.yaml
index 68dacb9..1006476 100644
--- a/packages/system/elemental/definition.yaml
+++ b/packages/system/elemental/definition.yaml
@@ -1,9 +1,9 @@
 name: "elemental-cli"
 category: "system"
-version: "0.2.0"
+version: "0.2.0-1"
 bin_name: "elemental"
 fips: false
 labels:
   github.repo: "elemental-cli"
   github.owner: "kairos-io"
-  git.hash: "af90aaa068a84fb888ed7280d4e7ff09793cda01"
+  git.hash: "1e05480185b1af1874f43f7c41aa43dd7c781c24"