wip

Author: mxcl

.github/workflows/ci.docker.yml

@@ -15,25 +15,8 @@ permissions:
   packages: write
 
 jobs:
-  build-pkgx:
-    runs-on: ubuntu-latest
-    container: debian:buster-slim
-    steps:
-      - uses: actions/checkout@v4
-
-      - run: apt-get update && apt-get install -y curl gcc perl make
-
-      - uses: dtolnay/rust-toolchain@stable
-      - run: cargo build --release
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: products
-          path: ./target/release/pkgx
-
   build-docker:
     runs-on: ubuntu-latest
-    needs: build-pkgx
     strategy:
       matrix:
         variety:
@@ -42,15 +25,15 @@ jobs:
           - debian
           - ubuntu
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v4
+      - uses: robinraju/release-downloader@v1.11
         with:
-          name: products
+          fileName: pkgx-*+linux+x86_64.tar.xz
+
+      - uses: actions/checkout@v4
 
       - run: |
           mkdir products
-          mv ./pkgx products/$(uname -m)
+          tar -C products xf pkgx*.tar.xz
           curl https://pkgxdev.github.io/pkgm/pkgm.ts -o products/pkgm
 
       - run:

docker/Dockerfile.busybox

@@ -3,7 +3,8 @@ COPY ./products/* /pkgx/
 RUN install -m 755 /pkgx/$(uname -m) /usr/local/bin/pkgx
 RUN install -m 755 /pkgx/pkgm /usr/local/bin/pkgm
 
-FROM busybox:glibc AS stage2
+# FIXME a newer glibc would be nice, but the libpthread.so we copy in then fails
+FROM busybox:1.31-glibc AS stage2
 COPY --from=stage1 /usr/local/bin/pkgx /usr/local/bin/pkgx
 COPY --from=stage1 /usr/local/bin/pkgm /usr/local/bin/pkgm