Merge pull request #16 from GioF71/15-feature-support-for-daily-build

add daily support
GioF71 · Oct 24, 2022 · 97f206b · 97f206b
2 parents 29fe73a + c2c91e5
commit 97f206b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/docker-multi-arch.yml b/.github/workflows/docker-multi-arch.yml
@@ -7,6 +7,7 @@ on:
       - "main/*"
       - "devel/*"
       - "feature/*"
+      - "daily/*"
 
 jobs:
   release:
@@ -51,21 +52,21 @@ jobs:
           special_tags[buster]="${image_name}:legacy"
 
           base_image=${base_image_from_matrix[${{ matrix.base }}]}
-          mpd_version=${mpdscribble_versions[${{ matrix.base }}]}
+          mpdscribble_version=${mpdscribble_versions[${{ matrix.base }}]}
 
           tags=""
           if [ "${ref_type}" = "branch" ]; then
             echo "branch mode";
             if [ "${ref_name}" = "main" ]; then
               echo "main branch";
               tags="${image_name}:main-${distro_id}";
-              tags="$tags,${image_name}:main-${distro_id}-${mpd_version}";
+              tags="$tags,${image_name}:main-${distro_id}-${mpdscribble_version}";
             elif [ "${ref_name}" = "devel" ]; then
               echo "devel branch";
-              tags="${image_name}:devel-${distro_id}-${mpd_version}"
+              tags="${image_name}:devel-${distro_id}-${mpdscribble_version}"
             else
               echo "other branch ["${ref_name}"]";
-              tags="${image_name}:branch-${ref_name}-${distro_id}-${mpd_version}";
+              tags="${image_name}:branch-${ref_name}-${distro_id}-${mpdscribble_version}";
             fi
           elif [ "${ref_type}" = "tag" ]; then
             echo "tag mode";
@@ -78,8 +79,8 @@ jobs:
               echo "release tag";
               echo "Building now: ["$distro_id"]";
               tags="${tags},$image_name:${distro_id}";
-              tags="${tags},$image_name:${distro_id}-${mpd_version}"
-              tags="$tags,$image_name:${distro_id}-${mpd_version}-${tag_name}"              
+              tags="${tags},$image_name:${distro_id}-${mpdscribble_version}"
+              tags="${tags},$image_name:${distro_id}-${mpdscribble_version}-${tag_name}"              
               select_special_tags=${special_tags["${distro_id}"]};
               if [[ -n "${select_special_tags}" ]]; then
                 echo "Found special tags for ["${distro_id}"]=["${select_special_tags}"]";
@@ -89,13 +90,17 @@ jobs:
               fi
             elif [ "${tag_type}" = "main" ]; then
               echo "main tag";
-              tags="${image_name}:main-${tag_name}-${distro_id}-${mpd_version}";
+              tags="${image_name}:main-${tag_name}-${distro_id}-${mpdscribble_version}";
             elif [ "${tag_type}" = "devel" ]; then
               echo "devel tag";
-              tags="${image_name}:devel-${tag_name}-${distro_id}-${mpd_version}";
+              tags="${image_name}:devel-${tag_name}-${distro_id}-${mpdscribble_version}";
             elif [ "${tag_type}" = "feature" ]; then
               echo "feature tag";
-              tags="${image_name}:feature-${tag_name}-${distro_id}-${mpd_version}";
+              tags="${image_name}:feature-${tag_name}-${distro_id}-${mpdscribble_version}";
+            elif [ "${tag_type}" = "daily" ]; then
+              echo "daily build";
+              tags="${tags},${image_name}:daily-${distro_id}";
+              tags="${tags},${image_name}:daily-${distro_id}-${mpdscribble_version}";
             fi
           fi
           echo "Building tags: ["${tags}"]"

diff --git a/README.md b/README.md
@@ -107,6 +107,7 @@ Just be careful to use the tag you have just built.
 
 Change Date|Major Changes
 ---|---
+2022-10-24|Support for daily builds
 2022-10-24|Bugfix (wrong variable references and missing permissions)
 2022-10-21|Run with unprivileged user
 2022-10-21|Switch to `mpdscribble`