Merge pull request #82 from kairos-io/fix_flush

kairos-io · Jul 3, 2024 · 1fe00c7 · 1fe00c7
2 parents 0c05777 + a643233
commit 1fe00c7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git 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

diff --git 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
@@ -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}}"
     },