Reapply Cargo.lock changes removing some bumps

This reverts commit 768fecc.
pkgxdev · Feb 14, 2025 · 2d60f40 · 2d60f40
1 parent 442fd1d
commit 2d60f40
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 103 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,26 +84,15 @@ jobs:
     needs: fmt
     strategy:
       matrix:
-        x:
-          - os: ubuntu-latest
-          - os: macos-latest
-          - os: ubuntu-latest
-            container: debian:buster-slim
-    runs-on: ${{ matrix.x.os }}
-    container: ${{ matrix.x.container }}
+        os:
+          - ubuntu-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 
-      # debian:buster-slim has no curl and the rust-toolchain action requires it
-      - run: apt-get update && apt-get install curl --yes
-        if: ${{ matrix.x.container }}
-
       - uses: dtolnay/rust-toolchain@stable
 
-      # we must uninstall ca-certs to test our ca-cert embed works
-      - run: apt-get remove ca-certificates curl openssl --yes
-        if: ${{ matrix.x.container }}
-
       - name: build
         run: |
           RUSTFLAGS="-C instrument-coverage" cargo build
@@ -158,7 +147,7 @@ jobs:
           test ! -d ~/.local/share/pkgx/pantry/projects/git-scm.org
           pkgx git --version
           test -d ~/.local/share/pkgx/pantry/projects/git-scm.org
-        if: ${{ matrix.x.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         # ^^ only on one platform as wasteful otherwise
 
       - name: generate coverage
@@ -177,7 +166,7 @@ jobs:
         with:
           path-to-lcov: lcov.info
           parallel: true
-          flag-name: ${{ matrix.x.os }}-integration
+          flag-name: ${{ matrix.os }}-integration
 
   upload-coverage:
     needs: [coverage-unit, coverage-integration]
@@ -186,3 +175,15 @@ jobs:
       - uses: coverallsapp/github-action@v2
         with:
           parallel-finished: true
+
+  test-minimal-container:
+    needs: fmt
+    runs-on: ubuntu-latest
+    container: debian:buster-slim
+    steps:
+      - uses: actions/checkout@v4
+      - run: apt-get update && apt-get install -y curl make gcc perl
+      - uses: dtolnay/rust-toolchain@stable
+      - run: apt-get remove curl ca-certificates openssl
+      - run: cargo build
+      - run: .target/debug/pkgx +git