ci: more grubbing about with alpine

.github/workflows/gen_alpine3.12.yml

@@ -28,7 +28,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.12_continuous.yml

@@ -31,7 +31,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -82,7 +82,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "find ~/packages -ls ; mv ~/packages/x86_64/*.apk ."
+        run: "mv ~/packages/x86_64/*.apk ."
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:

.github/workflows/gen_alpine3.12_tag.yml

@@ -19,7 +19,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.13.yml

@@ -28,7 +28,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.13_continuous.yml

@@ -31,7 +31,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"

.github/workflows/gen_alpine3.13_tag.yml

@@ -19,7 +19,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.14.yml

@@ -28,7 +28,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.14_continuous.yml

@@ -31,7 +31,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"

.github/workflows/gen_alpine3.14_tag.yml

@@ -19,7 +19,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.15.yml

@@ -28,7 +28,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -79,7 +79,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

.github/workflows/gen_alpine3.15_continuous.yml

@@ -31,7 +31,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"

.github/workflows/gen_alpine3.15_tag.yml

@@ -19,7 +19,7 @@ jobs:
         run: "apk upgrade --update-cache"
       - name: "Install CI dependencies"
         shell: sh
-        run: "apk add nodejs zstd wget bash"
+        run: "apk add nodejs zstd wget bash coreutils tar findutils"
       - name: "Allow root login"
         shell: bash
         run: "sed 's/root:!/root:*/g' -i /etc/shadow"
@@ -70,7 +70,7 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move APKs"
         shell: bash
-        run: "mv ~/packages/x86_64/*.apk ."
+        run: "find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk ."
       - name: "Move APK keys"
         shell: bash
         run: "mv ~/.abuild/*.pub ."

ci/generate-workflows.py

@@ -377,11 +377,11 @@ cargo build --all --release""",
                     f"mv ~/rpmbuild/RPMS/*/*.rpm .",
                 )
             )
-        elif "alpine" in self.name:
+        elif self.uses_apk():
             steps.append(
                 RunStep(
                     "Move APKs",
-                    f"mv ~/packages/x86_64/*.apk .",
+                    f"find ~/packages/ -ls ; mv ~/packages/x86_64/*.apk .",
                 )
             )
             steps.append(
@@ -434,7 +434,7 @@ cargo build --all --release""",
                     f"mv ~/rpmbuild/RPMS/*/*.rpm wezterm-nightly-{self.name}.rpm",
                 )
             )
-        elif "alpine" in self.name:
+        elif self.uses_apk():
             steps.append(
                 RunStep(
                     "Move APKs",
@@ -608,7 +608,7 @@ cargo build --all --release""",
                     ),
                     RunStep(
                         "Install CI dependencies",
-                        "apk add nodejs zstd wget bash",
+                        "apk add nodejs zstd wget bash coreutils tar findutils",
                         shell="sh",
                     ),
                     RunStep(