Merge main and fix conflicts

Author: magentaqin

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: recursive
 
@@ -60,7 +60,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           # fetch everything so we can checkout the tag
           fetch-depth: 0
@@ -101,7 +101,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           # fetch everything so we can checkout the tag
           fetch-depth: 0

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - name: Ensure SHA pinned actions
         uses: zgosalvez/github-actions-ensure-sha-pinned-actions@fc87bb5b5a97953d987372e74478de634726b3e5 # v3
         with:

.github/workflows/enforce-sha.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check PR title
-        uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5
+        uses: amannn/action-semantic-pull-request@fdd4d3ddf614fbcd8c29e4b106d3bbe0cb2c605d # v6
         id: check_pr_title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint-pr.yml

@@ -58,7 +58,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: recursive
       # Turn back on when we're on the released version of dist
@@ -75,7 +75,7 @@ jobs:
         with:
           crate: dist
           git: https://github.com/ruben-arts/cargo-dist.git
-          rev: 6f945d0efcaeabb0fc3e3472330bb7a294f80d29
+          rev: d4085f9cf734dbfeb49d6ff89b16c768b7977ad3 # feature/update_bin_in_root_tar
 
       - uses: prefix-dev/setup-pixi@main
         with:
@@ -143,7 +143,7 @@ jobs:
       - name: enable windows longpaths
         run: |
           git config --global core.longpaths true
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: recursive
 
@@ -153,7 +153,7 @@ jobs:
         with:
           crate: dist
           git: https://github.com/ruben-arts/cargo-dist.git
-          rev: 6f945d0efcaeabb0fc3e3472330bb7a294f80d29
+          rev: d4085f9cf734dbfeb49d6ff89b16c768b7977ad3 # feature/update_bin_in_root_tar
 
       - name: Install cargo-zigbuild
         # Only install on non windows platforms
@@ -170,7 +170,7 @@ jobs:
 
       # Get the dist-manifest
       - name: Fetch local artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -193,7 +193,7 @@ jobs:
           echo "dist ran successfully"
       - name: Attest Builds
         id: attest
-        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
+        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
           subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}"
       - run: cp ${{ steps.attest.outputs.bundle-path }} target/distrib/attestations-${{ join(matrix.targets, ', ') }}.intoto.jsonl
@@ -229,18 +229,18 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: recursive
       - name: Install cached dist
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Get all the local artifacts for the global tasks to use (for e.g. checksums)
       - name: Fetch local artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -278,18 +278,18 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: recursive
       - name: Install cached dist
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: cargo-dist-cache
           path: ~/.cargo/bin/
       - run: chmod +x ~/.cargo/bin/dist
       # Fetch artifacts from scratch-storage
       - name: Fetch artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           pattern: artifacts-*
           path: target/distrib/
@@ -399,12 +399,12 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           submodules: recursive
       # Create a GitHub Release while uploading all files to it
       - name: "Download GitHub Artifacts"
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           pattern: artifacts-*
           path: artifacts

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
   test-schema:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       - uses: prefix-dev/setup-pixi@main
         with:
           cache: true

.github/workflows/schema.yml

@@ -10,9 +10,9 @@ if (Test-Path "D:\") {
     Write-Output "Using existing drive at D:"
     $Drive = "D:"
 } else {
-	# The size is chosen empirically to be large enough for our
+	# The size (20 GB) is chosen empirically to be large enough for our
 	# workflows; larger drives can take longer to set up.
-	$Volume = New-VHD -Path C:/pixi_dev_drive.vhdx -Dynamic -SizeBytes 100GB |
+	$Volume = New-VHD -Path C:\pixi_dev_drive.vhdx -SizeBytes 20GB |
 						Mount-VHD -Passthru |
 						Initialize-Disk -Passthru |
 						New-Partition -AssignDriveLetter -UseMaximumSize |
@@ -29,8 +29,8 @@ if (Test-Path "D:\") {
 	fsutil devdrv enable /disallowAv
 
 	# Remount so the changes take effect
-	Dismount-VHD -Path C:/pixi_dev_drive.vhdx
-	Mount-VHD -Path C:/pixi_dev_drive.vhdx
+	Dismount-VHD -Path C:\pixi_dev_drive.vhdx
+	Mount-VHD -Path C:\pixi_dev_drive.vhdx
 
 	# Show some debug information
 	Write-Output $Volume
@@ -39,25 +39,24 @@ if (Test-Path "D:\") {
     Write-Output "Using Dev Drive at $Volume"
 }
 
-$Tmp = "$($Drive)/pixi-tmp"
+$Tmp = "$($Drive)\pixi-tmp"
 
 # Create the directory ahead of time in an attempt to avoid race-conditions
 New-Item $Tmp -ItemType Directory
 
 # Move Cargo to the dev drive
-New-Item -Path "$($Drive)/.cargo/bin" -ItemType Directory -Force
-if (Test-Path "C:/Users/runneradmin/.cargo") {
-    Copy-Item -Path "C:/Users/runneradmin/.cargo/*" -Destination "$($Drive)/.cargo/" -Recurse -Force
+New-Item -Path "$($Drive)\.cargo\bin" -ItemType Directory -Force
+if (Test-Path "C:\Users\runneradmin\.cargo") {
+    Copy-Item -Path "C:\Users\runneradmin\.cargo\*" -Destination "$($Drive)\.cargo\" -Recurse -Force
 }
 
-# Set environment variables for GitHub Actions
 Write-Output `
-    "DEV_DRIVE=$($Drive)" `
-    "TMP=$($Tmp)" `
-    "TEMP=$($Tmp)" `
-    "RUSTUP_HOME=$($Drive)/.rustup" `
-    "CARGO_HOME=$($Drive)/.cargo" `
-	"RATTLER_CACHE_DIR=$($Drive)/rattler-cache" `
-    "PIXI_HOME=$($Drive)/.pixi" `
-    "PIXI_WORKSPACE=$($Drive)/pixi" `
-    >> $env:GITHUB_ENV
+	"DEV_DRIVE=$($Drive)" `
+	"TMP=$($Tmp)" `
+	"TEMP=$($Tmp)" `
+	"RATTLER_CACHE_DIR=$($Drive)\rattler-cache" `
+	"RUSTUP_HOME=$($Drive)\.rustup" `
+	"CARGO_HOME=$($Drive)\.cargo" `
+	"PIXI_HOME=$($Drive)\.pixi" `
+	"PIXI_WORKSPACE=$($Drive)\pixi" `
+	>> $env:GITHUB_ENV

.github/workflows/setup-dev-drive.ps1

@@ -31,7 +31,7 @@ jobs:
       PYTEST_ADDOPTS: "--color=yes"
     steps:
       - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           ref: ${{ inputs.sha }}
       - name: Create Dev Drive using ReFS
@@ -42,7 +42,7 @@ jobs:
         run: |
           Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.PIXI_WORKSPACE }}" -Recurse
       - name: Download binary from build
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: pixi-${{ inputs.arch }}-${{ inputs.sha }}
           path: ${{ env.TARGET_RELEASE }}

.github/workflows/test_common_wheels.yml

@@ -1,11 +1,6 @@
 name: Update Trampoline Binaries
 
 on:
-  push:
-    paths:
-      - "trampoline/**"
-      - ".github/workflows/trampoline.yaml"
-      - "src/global/trampoline.rs"
   workflow_dispatch:
   pull_request:
     paths:
@@ -60,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           fetch-depth: 0 # Fetch full history so we have branch information
 
@@ -92,10 +87,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 
       - name: Download all binaries
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           path: trampoline/binaries/
           merge-multiple: true