From 4cea851d28f8f46fe5641affcd6fddf59b081e03 Mon Sep 17 00:00:00 2001
From: divolgin <dmitriy@replicated.com>
Date: Mon, 16 Dec 2024 23:02:09 +0000
Subject: [PATCH 1/2] Try a valid semver for melange package version

---
 .github/workflows/daily-scan.yaml | 2 +-
 .github/workflows/main.yaml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/daily-scan.yaml b/.github/workflows/daily-scan.yaml
index 6ea20828..f2ee6fe3 100644
--- a/.github/workflows/daily-scan.yaml
+++ b/.github/workflows/daily-scan.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           context: deploy
           image-name: replicated/replicated-sdk:${{ github.sha }}
-          git-tag: ${{ github.sha }}
+          git-tag: 1.0.0-${{ github.sha }}
           
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 533e986b..34f137dd 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -45,7 +45,7 @@ jobs:
         with:
           context: deploy
           image-name: ttl.sh/automated-${{ github.run_id }}/replicated/replicated-sdk:24h
-          git-tag: ${{ github.sha }}
+          git-tag: 1.0.0-${{ github.sha }}
 
       - name: Build replicated chart
         env:
@@ -140,7 +140,7 @@ jobs:
             printf "user-set extraEnv should exist:\n\n%s\n\n" "$output"
             exit 1
           fi
-          
+
           cat << EOF > test-values.yaml 
           tolerations:
           - key: "test-toleration-key"

From 7604ed3ca4e420371d8dab7f61b5160009d8efc2 Mon Sep 17 00:00:00 2001
From: divolgin <dmitriy@replicated.com>
Date: Mon, 16 Dec 2024 23:10:30 +0000
Subject: [PATCH 2/2] Use stric major.minor.patch format

---
 .github/workflows/daily-scan.yaml | 2 +-
 .github/workflows/main.yaml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/daily-scan.yaml b/.github/workflows/daily-scan.yaml
index f2ee6fe3..6a350bdc 100644
--- a/.github/workflows/daily-scan.yaml
+++ b/.github/workflows/daily-scan.yaml
@@ -37,7 +37,7 @@ jobs:
         with:
           context: deploy
           image-name: replicated/replicated-sdk:${{ github.sha }}
-          git-tag: 1.0.0-${{ github.sha }}
+          git-tag: "1.0.0" # can't use ${{ github.sha }} because melange config requires strict format.
           
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 34f137dd..bdc8b79d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -45,7 +45,7 @@ jobs:
         with:
           context: deploy
           image-name: ttl.sh/automated-${{ github.run_id }}/replicated/replicated-sdk:24h
-          git-tag: 1.0.0-${{ github.sha }}
+          git-tag: "1.0.0" # can't use ${{ github.sha }} because melange config requires strict format.
 
       - name: Build replicated chart
         env: