Merge branch 'cachix:main' into main

Author: sestrella

.cargo/config.toml

@@ -1,5 +1,9 @@
 [alias]
 xtask = "run --package xtask --"
 
+[build]
+# Allow using tracing's experimental support for Valuable
+rustflags = ["--cfg", "tracing_unstable"]
+
 [env]
 SNIX_BUILD_SANDBOX_SHELL = "/path/to/sandbox/shell"

.github/workflows/containers.yml

@@ -45,7 +45,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
@@ -112,7 +112,7 @@ jobs:
 
       - name: Log in to the Container registry
         run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | nix run nixpkgs#skopeo -- login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
+          echo "${{ secrets.GITHUB_TOKEN }}" | nix run nixpkgs#skopeo -- login ${{ env.REGISTRY }} -u ${{ github.repository_owner }} --password-stdin
 
       - name: Push image by digest
         id: push
@@ -121,15 +121,15 @@ jobs:
           IMAGE_NAME="${{ env.REGISTRY }}/${{ env.REPOSITORY }}/devenv"
 
           # Get the digest from the tarball
-          DIGEST=$(nix run nixpkgs#skopeo -- inspect "tarball:${IMAGE_PATH}" --format '{{.Digest}}')
+          DIGEST=$(nix run nixpkgs#skopeo -- inspect "docker-archive:${IMAGE_PATH}" --format '{{.Digest}}')
           echo "Image digest: $DIGEST"
 
           # Save digest for manifest creation
           mkdir -p /tmp/digests
           echo "$DIGEST" > "/tmp/digests/${{ matrix.arch }}.digest"
 
           # Push directly to digest reference without creating any tags
-          nix run nixpkgs#skopeo -- copy --preserve-digests "tarball:${IMAGE_PATH}" "docker://${IMAGE_NAME}@${DIGEST}"
+          nix run nixpkgs#skopeo -- copy --preserve-digests "docker-archive:${IMAGE_PATH}" "docker://${IMAGE_NAME}@${DIGEST}"
 
           echo "Pushed image to ${IMAGE_NAME}@${DIGEST}"
           echo "digest=$DIGEST" >> $GITHUB_OUTPUT
@@ -158,7 +158,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx

.github/workflows/pr-test.yml

@@ -8,8 +8,16 @@ on:
       - "requirements.in"
       - "requirements.txt"
 
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Git ref (tag or branch) to test'
+        required: true
+        default: 'main'
+        type: string
+
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -34,3 +42,4 @@ jobs:
     with:
       system: ${{ matrix.system }}
       runs-on: ${{ matrix.runs-on }}
+      ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ref || '' }}

.github/workflows/test.yml

@@ -56,9 +56,6 @@ jobs:
           path=$(nix build -L --print-out-paths)
           echo "$path/bin" >> $GITHUB_PATH
 
-      - name: Test tasks outside shell
-        run: devenv tasks run devenv:enterShell
-
       - name: Build override args
         id: override-args
         env:
@@ -70,8 +67,8 @@ jobs:
           fi
           echo "args=$override_args" >> $GITHUB_OUTPUT
 
-      - name: Run devenv-test-cli
-        run: devenv ${{ steps.override-args.outputs.args }} shell devenv-test-cli
+      - name: Run devenv test
+        run: devenv ${{ steps.override-args.outputs.args }} test
 
       - name: Run tests
         run: devenv-run-tests run tests ${{ steps.override-args.outputs.args }}

.gitignore

@@ -25,3 +25,4 @@ target/
 node_modules/
 
 **/.claude/settings.local.json
+.claude