From 59b7a556ea38ffce6dfc3ea96428d2669381d464 Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Wed, 3 Jul 2024 11:40:48 +0200
Subject: [PATCH 1/2] Fix flux renovate and build

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 flux/Dockerfile | 8 ++++----
 renovate.json   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/flux/Dockerfile b/flux/Dockerfile
index 116ac93..3f38bd3 100644
--- a/flux/Dockerfile
+++ b/flux/Dockerfile
@@ -1,9 +1,9 @@
-FROM alpine as build
-# renovate: datasource=github-releases depName=fluxcd/flux2 extractVersionTemplate=^v(?<version>.*)$
-ENV VERSION=v2.1.2
+FROM alpine AS build
+# renovate: datasource=github-releases depName=fluxcd/flux2
+ENV VERSION=2.1.2
 ENV CHECKSUM=61b360b50d6cfc34410730b1cebeb75f5eda2b484e47b9a083412f51ad56de68
 
-ADD https://github.com/fluxcd/flux2/releases/download/v${VERSION}/flux_${VERSION#v}_linux_amd64.tar.gz /tmp
+ADD https://github.com/fluxcd/flux2/releases/download/v${VERSION}/flux_${VERSION}_linux_amd64.tar.gz /tmp
 RUN DOWNLOAD_FILE="/tmp/flux_${VERSION}_linux_amd64.tar.gz" && \
     DOWNLOAD_CHECKSUM=$(sha256sum "${DOWNLOAD_FILE}" | awk '{print $1}') && \
     if [[ ${DOWNLOAD_CHECKSUM} != ${CHECKSUM} ]]; then \
diff --git a/renovate.json b/renovate.json
index a6644db..9e6240b 100644
--- a/renovate.json
+++ b/renovate.json
@@ -15,9 +15,9 @@
   ],
   "regexManagers": [
     {
-      "fileMatch": ["^Earthfile$", "/Dockerfile$"],
+      "fileMatch": ["^Earthfile$", "Dockerfile$"],
       "matchStrings": [
-        "#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s+depName=(?<depName>[^\\s]+)(\\s+versioning=(?<versioning>[^\\s]+))?(\\s+extractVersion=(?<extractVersion>[^\\n]+))?(\\s+extractVersionTemplate=(?<extractVersionTemplate>[^\\n]+))?\\n(ARG|ENV)\\s+([^\\s]+)?VERSION=(?<currentValue>[^\\n]+)(\\n(ARG|ENV)\\s+([^\\s]+)?CHECKSUM=(?<currentDigest>[a-f0-9]+))?"
+        "#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s+depName=(?<depName>[^\\s]+)(\\s+versioning=(?<versioning>[^\\s]+))?(\\s+extractVersion=(?<extractVersion>[^\\n]+))?(\\s+extractVersionTemplate=(?<extractVersionTemplate>[^\\n]+))?\\n(ARG|ENV)\\s+([^\\s]+)?VERSION=(?<currentValue>[^\\n]+)(\\n(ARG|ENV)\\s+([^\\s]+)?)"
       ],
       "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
     },

From a643233bbf51843589c72564b30d6db0069bee5e Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Wed, 3 Jul 2024 11:47:46 +0200
Subject: [PATCH 2/2] Fix double run on PR

Rests are running twice on PR, plus its not running for flux.
Even if it has no tests, the dockerfile should be built on PR to check
that we are not breaking it

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 .github/workflows/test.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4c93564..9905db9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -2,6 +2,8 @@ name: Test
 on:
   pull_request:
   push:
+    branches:
+      - main
 
 concurrency:
   group: ci-test-${{ github.head_ref || github.ref }}-${{ github.repository }}
@@ -23,6 +25,8 @@ jobs:
           - kyverno
           - system-upgrade-controller
           - "LocalAI"
+          - flux
+          - coco
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4