Merge latest ci-tools-lib

Squashed '.ci/' changes from a5cd89d..9725c2e
9725c2e fix: ensure we dont remove rc builds git-subtree-dir: .ci git-subtree-split: 9725c2ef8842467951ec60adb1b45dfeca7618f5
2025-04-17 22:58:54 +00:00 · 2025-04-17 22:58:54 +00:00 · 2025-04-17 22:49:41 +00:00 · 2025-04-17 22:49:41 +00:00 · 2025-04-17 22:08:30 +00:00 · 2025-04-15 03:05:20 +00:00
4 changed files with 7 additions and 6 deletions
--- a/.ci/README.md
+++ b/.ci/README.md
@ -14,7 +14,7 @@ include .ci/podman.mk

 Add subtree to your project:
 ```
-git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash
+git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git main --squash
 ```


--- a/.ci/ecr_public_lifecycle.py
+++ b/.ci/ecr_public_lifecycle.py
@ -41,7 +41,8 @@ for image in sorted(images, key=lambda d: d['imagePushedAt'], reverse=True):
        _delete = True
        for tag in image["imageTags"]:
            # Look for at least one tag NOT beign a SemVer dev tag
-            if "-" not in tag:
+            # untagged dev builds get tagged as <tag>-g<commit>
+            if "-g" not in tag and "dirty" not in tag:
                _delete = False
        if _delete:
            print("Deleting development image {}".format(image["imageTags"]))
--- a/.ci/podman.mk
+++ b/.ci/podman.mk
@ -8,8 +8,8 @@ SHELL := bash
 .PHONY: all # All targets are accessible for user
 .DEFAULT: help # Running Make will run the help target

-# Parse version from latest git semver tag
-GIT_TAG ?= $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
+# Parse version from latest git semver tag, use short commit otherwise
+GIT_TAG ?= $(shell git describe --tags --match v*.*.* --dirty 2>/dev/null || git describe --match="" --always --dirty 2>/dev/null)
 GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)

 TAG ::= $(GIT_TAG)
--- a/4
+++ b/4
@ -1,7 +1,7 @@
-FROM quay.io/argoproj/argocd:v2.14.9
+FROM quay.io/argoproj/argocd:v2.14.10

 # renovate: datasource=github-releases depName=sops packageName=getsops/sops
-ARG SOPS_VERSION=v3.10.1
+ARG SOPS_VERSION=v3.10.2
 # renovate: datasource=github-releases depName=vals packageName=helmfile/vals
 ARG VALS_VERSION=v0.40.1
 # renovate: datasource=github-releases depName=helm-secrets packageName=jkroepke/helm-secrets
Author	SHA1	Message	Date
Stefan Reimer	b4434314d0	Merge latest ci-tools-lib All checks were successful ZeroDownTime/zdt-argocd/pipeline/head This commit looks good Details	2025-04-17 22:58:54 +00:00
Stefan Reimer	e14f581e0a	Squashed '.ci/' changes from a5cd89d..9725c2e 9725c2e fix: ensure we dont remove rc builds git-subtree-dir: .ci git-subtree-split: 9725c2ef8842467951ec60adb1b45dfeca7618f5	2025-04-17 22:58:54 +00:00
Stefan Reimer	ef10a9dfe6	Merge latest ci-tools-lib All checks were successful ZeroDownTime/zdt-argocd/pipeline/head This commit looks good Details	2025-04-17 22:49:41 +00:00
Stefan Reimer	46ed0290d4	Squashed '.ci/' changes from 3feaf6f..a5cd89d a5cd89d feat: improve tag parsing, ensure dirty is added if needed 15e4d1f ci: make work with main branch git-subtree-dir: .ci git-subtree-split: a5cd89d73157c829eaf12f91a68f73826fbb35e7	2025-04-17 22:49:41 +00:00
Stefan Reimer	035a221836	Merge pull request 'chore(deps): update all non-major dependencies' (#9 ) from renovate/all-minor-patch into main All checks were successful ZeroDownTime/zdt-argocd/pipeline/head This commit looks good Details Reviewed-on: #9	2025-04-17 22:08:30 +00:00
Renovate Bot	b97a8789bf	chore(deps): update all non-major dependencies All checks were successful ZeroDownTime/zdt-argocd/pipeline/pr-main This commit looks good Details	2025-04-15 03:05:20 +00:00