Merge branch 'main' into revamp-query

Author: felipecrs

.github/workflows/cd.crates.yml

@@ -18,7 +18,7 @@ jobs:
     if: startsWith(github.event.release.tag_name || github.event.inputs.tag, 'v2')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.release.tag_name || github.event.inputs.tag }}
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/cd.docker.yml

@@ -72,7 +72,7 @@ jobs:
 
           curl -o products/pkgm https://pkgxdev.github.io/pkgm/pkgm.ts
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: src
 

.github/workflows/cd.vx.yml

@@ -16,7 +16,7 @@ jobs:
   retag:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{ github.event.release.tag_name }}
       - uses: fischerscode/tagger@v0

.github/workflows/cd.www.yml

@@ -20,7 +20,7 @@ jobs:
     if: startsWith(github.event.release.tag_name || github.event.inputs.tag, 'v2')
     runs-on: ubuntu-latest
     steps:
-      - uses: aws-actions/configure-aws-credentials@v4
+      - uses: aws-actions/configure-aws-credentials@v5
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/cd.yml

@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo test --all-features
         env:
@@ -32,7 +32,7 @@ jobs:
     env:
       FILENAME: pkgx-${{ github.event.inputs.version }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: ${{ env.FILENAME }}
       - name: clean
@@ -46,13 +46,12 @@ jobs:
         run: gh release upload --clobber
           v${{ github.event.inputs.version }}
           ../$FILENAME.tar.xz
-        working-directory:
-          ${{ env.FILENAME }}
+        working-directory: ${{ env.FILENAME }}
         env:
           # using this token rather than github.token due to `release not found` bug
           # https://github.com/pkgxdev/cli/issues/5252
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: srcs
           path: ${{ env.FILENAME }}.tar.gz
@@ -86,10 +85,19 @@ jobs:
     env:
       BASENAME: pkgx-${{ github.event.inputs.version }}+${{ matrix.platform.build-id }}
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: srcs
 
+      # debian:buster is archived, so we need to fix its sources.list
+      - name: fix debian:buster
+        if: ${{ matrix.platform.container == 'debian:buster-slim' }}
+        run: sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list
+
+      - run: |
+          apt-get update
+          apt-get install curl gcc perl-modules openssl make xz-utils --yes
+
       - uses: pkgxdev/setup@v4
         with:
           +: ${{ matrix.platform.pkgs }}

.github/workflows/ci.ca-cert.yml

@@ -16,23 +16,23 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: debian:buster-slim
+    container: debian:bullseye-slim
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - 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
+      - uses: actions/upload-artifact@v5
         with:
           path: ./target/release/pkgx
           name: pkgx
 
   test:
     needs: build
     runs-on: ubuntu-latest
-    container: debian:buster-slim
+    container: debian:bullseye-slim
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: pkgx
 

.github/workflows/ci.docker.yml

@@ -25,7 +25,7 @@ jobs:
           - debian
           - ubuntu
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: robinraju/release-downloader@v1.12
         with:

.github/workflows/ci.md.yml

@@ -14,8 +14,8 @@ jobs:
   markdownlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: nosborn/github-action-markdown-cli@v3.4.0
+      - uses: actions/checkout@v5
+      - uses: nosborn/github-action-markdown-cli@v3.5.0
         with:
           config_file: .github/markdownlint.yml
           files: .

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt
@@ -38,7 +38,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
@@ -53,7 +53,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo test --all-features
         env:
@@ -66,7 +66,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@v2
         with:
@@ -87,7 +87,7 @@ jobs:
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: dtolnay/rust-toolchain@stable
 
@@ -119,7 +119,7 @@ jobs:
       - run: pkgx -qq git --version
       - run: pkgx -s git --version
       - run: pkgx -j +git
-      - run: pkgx git\* --version  # test star constraints are valid
+      - run: pkgx git\* --version # test star constraints are valid
       - run: pkgx /usr/bin/awk --version
       - run: pkgx +yarnpkg.com yarn --version
       - run: pkgx +yarnpkg.com -- yarn --version
@@ -129,9 +129,11 @@ jobs:
       - run: pkgx -v +agg
       # testing we correctly handle +pkg syntax for pkgs with no env
       - run: pkgx +curl.se/ca-certs
+      # regression test: cargo has deep deps on linux that exercise range intersection
+      - run: pkgx +cargo
 
-      - run: '! pkgx flubber-flubbles'  # cmd not found machinery
-      - run: '! pkgx --sync flubber-flubbles'  # cmd not found machinery separate if branch
+      - run: "! pkgx flubber-flubbles" # cmd not found machinery
+      - run: "! pkgx --sync flubber-flubbles" # cmd not found machinery separate if branch
 
       # create a fork bomb, but since it’s via pkgx we prevent it
       - run: |
@@ -166,7 +168,7 @@ jobs:
           pkgx -Q
 
       - run: if [ $(find ~/.pkgx -name .tmp\* -type d | wc -l) -gt 0 ]; then
-            exit 1;
+          exit 1;
           fi
 
       - name: --shebang test 1
@@ -178,7 +180,7 @@ jobs:
       - name: --shebang test 2
         run: test $(pkgx -q! echo fail hi) = hi
 
-      - name: '@latest'
+      - name: "@latest"
         run: |
           pkgx semverator eq $(pkgx krampus=0.2.0 --version) 0.2.0
           pkgx semverator gt $(pkgx krampus@latest --version) 0.2.0
@@ -230,9 +232,9 @@ jobs:
   test-minimal-container:
     needs: fmt
     runs-on: ubuntu-latest
-    container: debian:buster-slim
+    container: debian:bullseye-slim
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - 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 --yes