Merge pull request #116 from garethahealy/main

fixed ci
redhat-cop · Nov 20, 2023 · 0b15eb5 · 0b15eb5
2 parents 3bab4a8 + fdf6ba5
commit 0b15eb5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 33 deletions.
diff --git a/.github/workflows/get-image-version.yaml b/.github/workflows/get-image-version.yaml
@@ -42,8 +42,13 @@ jobs:
               echo "MINOR_VERSION missmatch"
               exit 1
           fi
+          
+          expected_tags=("latest" "v1.32.1" "v1.32")
+          if [[ "${GITHUB_REF}" =~ refs/tags/(.*) ]]; then
+            expected_tags+=("git-${BASH_REMATCH[1]}")
+          fi
 
-          if [[ "${tags[*]}" != "latest v1.32.1 v1.32" ]]; then
+          if [[ "${tags[*]}" != "${expected_tags[*]}" ]]; then
               echo "IMAGE_TAGS missmatch"
               exit 1
           fi
diff --git a/.github/workflows/s2i.yaml b/.github/workflows/s2i.yaml
diff --git a/disconnected-csv/Dockerfile b/disconnected-csv/Dockerfile
@@ -1,4 +1,5 @@
-FROM quay.io/skopeo/stable:v1@sha256:baaaf8c5fdfa71a7c5ce67826998feccff5b90b1a749825f19789d1a473c3d8a
+# renovate: datasource=github-releases depName=containers/skopeo
+FROM quay.io/skopeo/stable:v1.13.3
 
 LABEL version="1.0.0"
 LABEL repository="http://github.com/redhat-cop/github-actions"