[Feature] Support ARMv6 #179

GioF71 · Mar 10, 2023 · 4e27de7 · 4e27de7
1 parent fd20cac
commit 4e27de7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 79 deletions.
diff --git a/.github/workflows/docker-multi-arch.yml b/.github/workflows/docker-multi-arch.yml
@@ -15,25 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        base: ["unstable", "sid", "bookworm", "bullseye", "buster", "kinetic", "jammy"]
-        sourceforge: ["Y", "N"]
-        exclude:
-          - base: "kinetic"
-            sourceforge: "Y"
-          - base: "jammy"
-            sourceforge: "Y"
-          - base: "buster"
-            sourceforge: "N"
-          - base: "bookworm"
-            sourceforge: "Y"
-          - base: "sid"
-            sourceforge: "Y"
-          - base: "sid"
-            sourceforge: "N"
-          - base: "unstable"
-            sourceforge: "Y"
-          - base: "unstable"
-            sourceforge: "N"
+        base: ["bullseye"]
+        sourceforge: ["N"]
 
     steps:
       - name: Checkout
@@ -78,26 +61,12 @@ jobs:
 
           declare -A special_tags
 
-          special_tags[kinetic-N]="${image_name}:latest"
-          special_tags[jammy-N]="${image_name}:stable"
-          special_tags[bookworm-N]="${image_name}:edge"
-          special_tags[buster-N]="${image_name}:legacy"
-          special_tags[bullseye-Y]="${image_name}:sourceforge-latest"
-          special_tags[buster-Y]="${image_name}:sourceforge-legacy"
-
-          stable="jammy-N"
-          latest="kinetic-N"
-          edge=bookworm-N
-          legacy="buster-N"
-          sourceforge_latest="bullseye-Y"
-          sourceforge_legacy="buster-Y"
-
-          tag_stable="stable"
-          tag_latest="latest"
-          tag_edge="edge"
-          tag_legacy="legacy"
-          tag_sourceforge_latest="sourceforge-latest"
-          tag_sourceforge_legacy="sourceforge-legacy"
+          special_tags[kinetic-N]="${image_name}:latest-armv6"
+          special_tags[jammy-N]="${image_name}:stable-armv6"
+          special_tags[bookworm-N]="${image_name}:edge-armv6"
+          special_tags[buster-N]="${image_name}:legacy-armv6"
+          special_tags[bullseye-Y]="${image_name}:sourceforge-latest-armv6"
+          special_tags[buster-Y]="${image_name}:sourceforge-legacy-armv6"
 
           squeezelite_version_str=""
           select_squeezelite_version=unknown
@@ -118,14 +87,14 @@ jobs:
             echo "branch mode";
             if [ "${ref_name}" = "main" ]; then
               echo "main branch";
-              tags="${image_name}:main-${distro_id}";
-              tags="$tags,${image_name}:main-${distro_id}-${squeezelite_version_str}";
+              tags="${image_name}:main-${distro_id}-armv6";
+              tags="$tags,${image_name}:main-${distro_id}-${squeezelite_version_str}-armv6";
             elif [ "${ref_name}" = "devel" ]; then
               echo "devel branch";
-              tags="${image_name}:devel-${distro_id}-${squeezelite_version_str}"
+              tags="${image_name}:devel-${distro_id}-${squeezelite_version_str}-armv6"
             else
               echo "other branch ["${ref_name}"]";
-              tags="${image_name}:branch-${ref_name}-${distro_id}-${squeezelite_version_str}";
+              tags="${image_name}:branch-${ref_name}-${distro_id}-${squeezelite_version_str}-armv6";
             fi
           elif [ "${ref_type}" = "tag" ]; then
             echo "tag mode";
@@ -136,8 +105,8 @@ jobs:
 
             if [ "${tag_type}" = "release" ]; then
               echo "release tag";
-              tags="$image_name:${distro_id}-${squeezelite_version_str}"
-              tags="$tags,$image_name:${distro_id}-${squeezelite_version_str}-${tag_name}"
+              tags="$image_name:${distro_id}-${squeezelite_version_str}-armv6"
+              tags="$tags,$image_name:${distro_id}-${squeezelite_version_str}-${tag_name}-armv6"
 
               building_now="${distro_id}-${{ matrix.sourceforge }}";
               echo "Building now: ["$building_now"]";
@@ -150,23 +119,23 @@ jobs:
               fi
               
               if [ "${{ matrix.sourceforge }}" = "N" ]; then
-                tags="${tags},$image_name:${distro_id}";
+                tags="${tags},$image_name:${distro_id}-armv6";
               else
-                tags="${tags},$image_name:sourceforge-${distro_id}";
+                tags="${tags},$image_name:sourceforge-${distro_id}-armv6";
               fi
             elif [ "${tag_type}" = "main" ]; then
               echo "main tag";
-              tags="${image_name}:main-${tag_name}-${distro_id}-${squeezelite_version_str}";
+              tags="${image_name}:main-${tag_name}-${distro_id}-${squeezelite_version_str}-armv6";
             elif [ "${tag_type}" = "devel" ]; then
               echo "devel tag";
-              tags="${image_name}:devel-${tag_name}-${distro_id}-${squeezelite_version_str}";
+              tags="${image_name}:devel-${tag_name}-${distro_id}-${squeezelite_version_str}-armv6";
             elif [ "${tag_type}" = "feature" ]; then
               echo "devel tag";
-              tags="${image_name}:feature-${tag_name}-${distro_id}-${squeezelite_version_str}";
+              tags="${image_name}:feature-${tag_name}-${distro_id}-${squeezelite_version_str}-armv6";
             elif [ "${tag_type}" = "daily" ]; then
               echo "daily build";
-              tags="${tags},${image_name}:daily-${distro_id}";
-              tags="${tags},${image_name}:daily-${distro_id}-${squeezelite_version_str}";
+              tags="${tags},${image_name}:daily-${distro_id}-armv6";
+              tags="${tags},${image_name}:daily-${distro_id}-${squeezelite_version_str}-armv6";
             fi
           fi
           echo "Building tags: ["${tags}"]"
@@ -191,6 +160,6 @@ jobs:
           build-args: |
             BASE_IMAGE=${{ env.BASE_IMAGE }}
             DOWNLOAD_FROM_SOURCEFORGE=${{ matrix.sourceforge }}
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/arm/v6
           push: true
           tags: ${{ env.RELEASE_TAGS }}
diff --git a/.github/workflows/sync-readme.yml b/.github/workflows/sync-readme.yml
diff --git a/install/installer.sh b/install/installer.sh
@@ -23,6 +23,7 @@ echo $DOWNLOADED_BIN
         URL_armv7l_PULSE="https://sourceforge.net/projects/lmsclients/files/squeezelite/linux/squeezelite-pulse-1.9.9.1392-armhf.tar.gz/download"; \
         echo $ARCH; \
         SL_URL=""; \
+        SL_URL_PULSE=""; \
         apt-get update; \
         DEBIAN_FRONTEND=noninteractive apt-get upgrade -y; \
         apt-get install wget -y; \
@@ -41,16 +42,20 @@ echo $DOWNLOADED_BIN
             echo "Unsupported platform ["$ARCH"]"; \
         fi && \
         echo "Downloading for architecture [$ARCH]"; \
+        if [[ -n "${SL_URL}" ]]; then \
         wget $SL_URL -O /assets/sourceforge/squeezelite.tar.gz; \
         mkdir /assets/sourceforge/expanded; \
         tar xzvf /assets/sourceforge/squeezelite.tar.gz -C /assets/sourceforge/expanded; \
         ls -la /assets/sourceforge/expanded/; \
         mv /assets/sourceforge/expanded/squeezelite $OUTPUT_FILE; \
+        fi; \
+        if [[ -n "${SL_URL_PULSE}" ]]; then \
         wget $SL_URL_PULSE -O /assets/sourceforge/squeezelite-pulse.tar.gz; \
         mkdir /assets/sourceforge/expanded-pulse; \
         tar xzvf /assets/sourceforge/squeezelite-pulse.tar.gz -C /assets/sourceforge/expanded-pulse; \
         ls -la /assets/sourceforge/expanded-pulse/; \
         mv /assets/sourceforge/expanded-pulse/squeezelite $OUTPUT_FILE_PULSE; \
+        fi; \
         apt-get purge wget -y; \
         apt-get autoremove -y; \
         rm -Rf \"/var/lib/apt/lists/*\"; \