allow split packages to be built (#27)

oklopfer · ook37 · web-flow · commit a96651483114 · 2025-06-09T15:18:56.000-04:00
I'm sure other problems will arise while getting this together
but this should at least work at base

---------

Co-authored-by: ook37 &lt;oren+12345@taumoda.com&gt;
diff --git a/.github/workflows/pkg-ananicy-cpp.yml b/.github/workflows/pkg-ananicy-cpp.yml
@@ -34,26 +34,39 @@ jobs:
         m_dist="${{ matrix.distro }}"
         m_arch="${{ matrix.architecture }}"
         ../scripts/packer.sh "${m_name}" "${m_dist}" "${m_arch}"
-        debfile=(*${m_arch}.deb)
-        echo "DEBNAME=${debfile}" >> $GITHUB_ENV
+        debfiles=(*.deb)
+        if [ ${#debfiles[@]} -gt 1 ]; then
+          echo "DEBNAME=${m_name}:${m_arch}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out" >> $GITHUB_ENV
+        else
+          echo "DEBNAME=${debfiles[0]}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out/${debfiles[0]}" >> $GITHUB_ENV
+        fi
     - name: Upload .deb files
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.DEBNAME }}@${{ matrix.distro }}
-        path: out/${{ env.DEBNAME }}
+        name: ${{ env.DEBNAME }}
+        path: ${{ env.DEBPATH }}
     - name: Upload to server
       run: |
         LOCATION="${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}"
         LOCAL_PORT=8080
         REMOTE_PORT=${{ secrets.APTLY_PORT }}
         REPO_URL="http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/packages"
         ssh -i ~/.ssh/id_ed25519 -fN -L ${LOCAL_PORT}:localhost:${REMOTE_PORT} "${LOCATION}"
-        rm_str="$(./scripts/checker.sh overflow ananicy-cpp ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
-        if [ -n "${rm_str}" ]; then
-          echo "Removing ${rm_str}..."
-          curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+        children=($(curl -fsSL https://pacstall.dev/api/packages/ananicy-cpp | jq -r '.baseChildren[]'))
+        if [ ${#children[@]} -le 1 ]; then
+          children=("ananicy-cpp")
         fi
-        curl -X POST -F file=@out/${{ env.DEBNAME }} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq
+        for i in "${children[@]}"; do
+          unset rm_str
+          rm_str="$(./scripts/checker.sh overflow ${i} ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
+          if [ -n "${rm_str}" ]; then
+            echo "Removing ${rm_str}..."
+            curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+          fi
+        done
+        for i in out/*.deb; do curl -X POST -F file=@${i} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq; done
         curl -s -X POST -H 'Content-Type: application/json' \
           "http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/file/${{ matrix.distro }}?forceReplace=1" | jq
         curl -X PUT -H 'Content-Type: application/json' --data '{"Signing": {"Skip": false, "GpgKey": "${{ secrets.GPG_KEY }}"}, "MultiDist": true, "ForceOverwrite": true}' "http://localhost:${LOCAL_PORT}/api/publish/pacstall/pacstall" | jq
diff --git a/.github/workflows/pkg-emacs.yml b/.github/workflows/pkg-emacs.yml
@@ -34,26 +34,39 @@ jobs:
         m_dist="${{ matrix.distro }}"
         m_arch="${{ matrix.architecture }}"
         ../scripts/packer.sh "${m_name}" "${m_dist}" "${m_arch}"
-        debfile=(*${m_arch}.deb)
-        echo "DEBNAME=${debfile}" >> $GITHUB_ENV
+        debfiles=(*.deb)
+        if [ ${#debfiles[@]} -gt 1 ]; then
+          echo "DEBNAME=${m_name}:${m_arch}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out" >> $GITHUB_ENV
+        else
+          echo "DEBNAME=${debfiles[0]}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out/${debfiles[0]}" >> $GITHUB_ENV
+        fi
     - name: Upload .deb files
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.DEBNAME }}@${{ matrix.distro }}
-        path: out/${{ env.DEBNAME }}
+        name: ${{ env.DEBNAME }}
+        path: ${{ env.DEBPATH }}
     - name: Upload to server
       run: |
         LOCATION="${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}"
         LOCAL_PORT=8080
         REMOTE_PORT=${{ secrets.APTLY_PORT }}
         REPO_URL="http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/packages"
         ssh -i ~/.ssh/id_ed25519 -fN -L ${LOCAL_PORT}:localhost:${REMOTE_PORT} "${LOCATION}"
-        rm_str="$(./scripts/checker.sh overflow emacs ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
-        if [ -n "${rm_str}" ]; then
-          echo "Removing ${rm_str}..."
-          curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+        children=($(curl -fsSL https://pacstall.dev/api/packages/emacs | jq -r '.baseChildren[]'))
+        if [ ${#children[@]} -le 1 ]; then
+          children=("emacs")
         fi
-        curl -X POST -F file=@out/${{ env.DEBNAME }} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq
+        for i in "${children[@]}"; do
+          unset rm_str
+          rm_str="$(./scripts/checker.sh overflow ${i} ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
+          if [ -n "${rm_str}" ]; then
+            echo "Removing ${rm_str}..."
+            curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+          fi
+        done
+        for i in out/*.deb; do curl -X POST -F file=@${i} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq; done
         curl -s -X POST -H 'Content-Type: application/json' \
           "http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/file/${{ matrix.distro }}?forceReplace=1" | jq
         curl -X PUT -H 'Content-Type: application/json' --data '{"Signing": {"Skip": false, "GpgKey": "${{ secrets.GPG_KEY }}"}, "MultiDist": true, "ForceOverwrite": true}' "http://localhost:${LOCAL_PORT}/api/publish/pacstall/pacstall" | jq
diff --git a/.github/workflows/pkg-nushell-bin.yml b/.github/workflows/pkg-nushell-bin.yml
@@ -34,26 +34,39 @@ jobs:
         m_dist="${{ matrix.distro }}"
         m_arch="${{ matrix.architecture }}"
         ../scripts/packer.sh "${m_name}" "${m_dist}" "${m_arch}"
-        debfile=(*${m_arch}.deb)
-        echo "DEBNAME=${debfile}" >> $GITHUB_ENV
+        debfiles=(*.deb)
+        if [ ${#debfiles[@]} -gt 1 ]; then
+          echo "DEBNAME=${m_name}:${m_arch}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out" >> $GITHUB_ENV
+        else
+          echo "DEBNAME=${debfiles[0]}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out/${debfiles[0]}" >> $GITHUB_ENV
+        fi
     - name: Upload .deb files
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.DEBNAME }}@${{ matrix.distro }}
-        path: out/${{ env.DEBNAME }}
+        name: ${{ env.DEBNAME }}
+        path: ${{ env.DEBPATH }}
     - name: Upload to server
       run: |
         LOCATION="${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}"
         LOCAL_PORT=8080
         REMOTE_PORT=${{ secrets.APTLY_PORT }}
         REPO_URL="http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/packages"
         ssh -i ~/.ssh/id_ed25519 -fN -L ${LOCAL_PORT}:localhost:${REMOTE_PORT} "${LOCATION}"
-        rm_str="$(./scripts/checker.sh overflow nushell-bin ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
-        if [ -n "${rm_str}" ]; then
-          echo "Removing ${rm_str}..."
-          curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+        children=($(curl -fsSL https://pacstall.dev/api/packages/nushell-bin | jq -r '.baseChildren[]'))
+        if [ ${#children[@]} -le 1 ]; then
+          children=("nushell-bin")
         fi
-        curl -X POST -F file=@out/${{ env.DEBNAME }} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq
+        for i in "${children[@]}"; do
+          unset rm_str
+          rm_str="$(./scripts/checker.sh overflow ${i} ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
+          if [ -n "${rm_str}" ]; then
+            echo "Removing ${rm_str}..."
+            curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+          fi
+        done
+        for i in out/*.deb; do curl -X POST -F file=@${i} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq; done
         curl -s -X POST -H 'Content-Type: application/json' \
           "http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/file/${{ matrix.distro }}?forceReplace=1" | jq
         curl -X PUT -H 'Content-Type: application/json' --data '{"Signing": {"Skip": false, "GpgKey": "${{ secrets.GPG_KEY }}"}, "MultiDist": true, "ForceOverwrite": true}' "http://localhost:${LOCAL_PORT}/api/publish/pacstall/pacstall" | jq
diff --git a/.github/workflows/pkg-pacstall.yml b/.github/workflows/pkg-pacstall.yml
@@ -31,26 +31,39 @@ jobs:
         m_dist="${{ matrix.distro }}"
         m_arch="${{ matrix.architecture }}"
         ../scripts/packer.sh "${m_name}" "${m_dist}" "${m_arch}"
-        debfile=(*${m_arch}.deb)
-        echo "DEBNAME=${debfile}" >> $GITHUB_ENV
+        debfiles=(*.deb)
+        if [ ${#debfiles[@]} -gt 1 ]; then
+          echo "DEBNAME=${m_name}:${m_arch}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out" >> $GITHUB_ENV
+        else
+          echo "DEBNAME=${debfiles[0]}@${m_dist}" >> $GITHUB_ENV
+          echo "DEBPATH=out/${debfiles[0]}" >> $GITHUB_ENV
+        fi
     - name: Upload .deb files
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.DEBNAME }}@${{ matrix.distro }}
-        path: out/${{ env.DEBNAME }}
+        name: ${{ env.DEBNAME }}
+        path: ${{ env.DEBPATH }}
     - name: Upload to server
       run: |
         LOCATION="${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}"
         LOCAL_PORT=8080
         REMOTE_PORT=${{ secrets.APTLY_PORT }}
         REPO_URL="http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/packages"
         ssh -i ~/.ssh/id_ed25519 -fN -L ${LOCAL_PORT}:localhost:${REMOTE_PORT} "${LOCATION}"
-        rm_str="$(./scripts/checker.sh overflow pacstall ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
-        if [ -n "${rm_str}" ]; then
-          echo "Removing ${rm_str}..."
-          curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+        children=($(curl -fsSL https://pacstall.dev/api/packages/pacstall | jq -r '.baseChildren[]'))
+        if [ ${#children[@]} -le 1 ]; then
+          children=("pacstall")
         fi
-        curl -X POST -F file=@out/${{ env.DEBNAME }} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq
+        for i in "${children[@]}"; do
+          unset rm_str
+          rm_str="$(./scripts/checker.sh overflow ${i} ${{ matrix.distro }} ${{ matrix.architecture }} 5 ${REPO_URL})"
+          if [ -n "${rm_str}" ]; then
+            echo "Removing ${rm_str}..."
+            curl -X DELETE -H 'Content-Type: application/json' --data "{\"PackageRefs\": [${rm_str}]}" "${REPO_URL}" | jq
+          fi
+        done
+        for i in out/*.deb; do curl -X POST -F file=@${i} "http://localhost:${LOCAL_PORT}/api/files/${{ matrix.distro }}" | jq; done
         curl -s -X POST -H 'Content-Type: application/json' \
           "http://localhost:${LOCAL_PORT}/api/repos/ppr-${{ matrix.distro }}/file/${{ matrix.distro }}?forceReplace=1" | jq
         curl -X PUT -H 'Content-Type: application/json' --data '{"Signing": {"Skip": false, "GpgKey": "${{ secrets.GPG_KEY }}"}, "MultiDist": true, "ForceOverwrite": true}' "http://localhost:${LOCAL_PORT}/api/publish/pacstall/pacstall" | jq
diff --git a/manager.py b/manager.py
@@ -152,10 +152,10 @@ def gen_workflow(package_name, package_data):
                     {
                         "name": "Set up SSH key",
                         "run": LiteralString(
-                            f"mkdir -p ~/.ssh\n"
-                            f"echo \"${{{{ secrets.SSH_KEY }}}}\" > ~/.ssh/id_ed25519\n"
-                            f"chmod 600 ~/.ssh/id_ed25519\n"
-                            f"ssh-keyscan -H \"${{{{ secrets.SSH_IP }}}}\" >> ~/.ssh/known_hosts"
+                            "mkdir -p ~/.ssh\n"
+                            "echo \"${{ secrets.SSH_KEY }}\" > ~/.ssh/id_ed25519\n"
+                            "chmod 600 ~/.ssh/id_ed25519\n"
+                            "ssh-keyscan -H \"${{ secrets.SSH_IP }}\" >> ~/.ssh/known_hosts"
                         )
                     },
                     {
@@ -166,16 +166,22 @@ def gen_workflow(package_name, package_data):
                             f"m_dist=\"${{{{ matrix.distro }}}}\"\n"
                             f"m_arch=\"${{{{ matrix.architecture }}}}\"\n"
                             f"../scripts/packer.sh \"${{m_name}}\" \"${{m_dist}}\" \"${{m_arch}}\"\n"
-                            "debfile=(*${m_arch}.deb)\n"
-                            "echo \"DEBNAME=${debfile}\" >> $GITHUB_ENV"
+                            f"debfiles=(*.deb)\n"
+                            f"if [ ${{#debfiles[@]}} -gt 1 ]; then\n"
+                            f"  echo \"DEBNAME=${{m_name}}:${{m_arch}}@${{m_dist}}\" >> $GITHUB_ENV\n"
+                            f"  echo \"DEBPATH=out\" >> $GITHUB_ENV\n"
+                            f"else\n"
+                            f"  echo \"DEBNAME=${{debfiles[0]}}@${{m_dist}}\" >> $GITHUB_ENV\n"
+                            f"  echo \"DEBPATH=out/${{debfiles[0]}}\" >> $GITHUB_ENV\n"
+                            f"fi"
                         )
                     },
                     {
                         "name": "Upload .deb files",
                         "uses": "actions/upload-artifact@v4",
                         "with": {
-                            "name": "${{ env.DEBNAME }}@${{ matrix.distro }}",
-                            "path": "out/${{ env.DEBNAME }}"
+                            "name": "${{ env.DEBNAME }}",
+                            "path": "${{ env.DEBPATH }}"
                         }
                     },
                     {
@@ -186,10 +192,12 @@ def gen_workflow(package_name, package_data):
                             f"REMOTE_PORT=${{{{ secrets.APTLY_PORT }}}}\n"
                             f"REPO_URL=\"http://localhost:${{LOCAL_PORT}}/api/repos/ppr-${{{{ matrix.distro }}}}/packages\"\n"
                             f"ssh -i ~/.ssh/id_ed25519 -fN -L ${{LOCAL_PORT}}:localhost:${{REMOTE_PORT}} \"${{LOCATION}}\"\n"
-                            f"rm_str=\"$(./scripts/checker.sh overflow {package_name} ${{{{ matrix.distro }}}} ${{{{ matrix.architecture }}}} {overflow} ${{REPO_URL}})\"\n"
-                            f"if [ -n \"${{rm_str}}\" ]; then\n  echo \"Removing ${{rm_str}}...\"\n"
-                            f"  curl -X DELETE -H 'Content-Type: application/json' --data \"{{\\\"PackageRefs\\\": [${{rm_str}}]}}\" \"${{REPO_URL}}\" | jq\nfi\n"
-                            f"curl -X POST -F file=@out/${{{{ env.DEBNAME }}}} \"http://localhost:${{LOCAL_PORT}}/api/files/${{{{ matrix.distro }}}}\" | jq\n"
+                            f"children=($(curl -fsSL https://pacstall.dev/api/packages/{package_name} | jq -r '.baseChildren[]'))\n"
+                            f"if [ ${{#children[@]}} -le 1 ]; then\n  children=(\"{package_name}\")\nfi\nfor i in \"${{children[@]}}\"; do\n"
+                            f"  unset rm_str\n  rm_str=\"$(./scripts/checker.sh overflow ${{i}} ${{{{ matrix.distro }}}} ${{{{ matrix.architecture }}}} {overflow} ${{REPO_URL}})\"\n"
+                            f"  if [ -n \"${{rm_str}}\" ]; then\n    echo \"Removing ${{rm_str}}...\"\n"
+                            f"    curl -X DELETE -H 'Content-Type: application/json' --data \"{{\\\"PackageRefs\\\": [${{rm_str}}]}}\" \"${{REPO_URL}}\" | jq\n  fi\ndone\n"
+                            f"for i in out/*.deb; do curl -X POST -F file=@${{i}} \"http://localhost:${{LOCAL_PORT}}/api/files/${{{{ matrix.distro }}}}\" | jq; done\n"
                             f"curl -s -X POST -H 'Content-Type: application/json' \\\n"
                             f"  \"http://localhost:${{LOCAL_PORT}}/api/repos/ppr-${{{{ matrix.distro }}}}/file/${{{{ matrix.distro }}}}?forceReplace=1\" | jq\n"
                             f"curl -X PUT -H 'Content-Type: application/json' --data '{{\"Signing\": {{\"Skip\": false, \"GpgKey\": \"${{{{ secrets.GPG_KEY }}}}\"}}, \"MultiDist\": true, \"ForceOverwrite\": true}}' \"http://localhost:${{LOCAL_PORT}}/api/publish/pacstall/pacstall\" | jq\n"
diff --git a/scripts/packer.sh b/scripts/packer.sh
@@ -96,7 +96,7 @@ packer() {
     docker run --net=host --privileged "ghcr.io/pacstall/${dist}${target}" bash -c "mkdir -p out && cd out && pacstall -PBINs ${pkg}" \
     && container="$(docker ps -lq)" \
     && docker cp "${container}":/home/pacstall/out/. . \
-    && echo -e "[${BCyan}⌘${NC}] ${BOLD}PACK${NC}: deb for ${BPurple}${pkg}${NC}/${BLUE}${dist/-/:}${NC}/${CYAN}${a}${NC} built at ${BGreen}${PWD}${NC}" \
+    && echo -e "[${BCyan}⌘${NC}] ${BOLD}PACK${NC}: deb(s) for ${BPurple}${pkg}${NC}/${BLUE}${dist/-/:}${NC}/${CYAN}${a}${NC} built at ${BGreen}${PWD}${NC}" \
     && docker rm "${container}" &> /dev/null
   done
 }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ packer() {`
`96`	`96`	`docker run --net=host --privileged "ghcr.io/pacstall/${dist}${target}" bash -c "mkdir -p out && cd out && pacstall -PBINs ${pkg}" \`
`97`	`97`	`&& container="$(docker ps -lq)" \`
`98`	`98`	`&& docker cp "${container}":/home/pacstall/out/. . \`
`99`		`- && echo -e "[${BCyan}⌘${NC}] ${BOLD}PACK${NC}: deb for ${BPurple}${pkg}${NC}/${BLUE}${dist/-/:}${NC}/${CYAN}${a}${NC} built at ${BGreen}${PWD}${NC}" \`
	`99`	`+ && echo -e "[${BCyan}⌘${NC}] ${BOLD}PACK${NC}: deb(s) for ${BPurple}${pkg}${NC}/${BLUE}${dist/-/:}${NC}/${CYAN}${a}${NC} built at ${BGreen}${PWD}${NC}" \`
`100`	`100`	`&& docker rm "${container}" &> /dev/null`
`101`	`101`	`done`
`102`	`102`	`}`