Merge branch 'main' into fix-joke

.github/workflows/docker.yml

@@ -51,13 +51,18 @@ jobs:
     env:
       REGISTRY: ghcr.io
       USERNAME: ${{ github.actor }}
-      IMAGE_NAME: ${{ github.repository }}
 
     if: github.event_name == 'push'
 
     steps:
       - uses: actions/checkout@v4
 
+      - name: Determine image name
+        run: |
+          echo "IMAGE_NAME=${REPOSITORY,,}" >> "$GITHUB_ENV"
+        env:
+          REPOSITORY: '${{ github.repository }}'
+
       - name: Download images
         uses: actions/download-artifact@v4
         with:

.github/workflows/update-flake.yml

@@ -30,11 +30,6 @@ jobs:
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
-      - name: Create new branch
-        id: branch
-        run: |
-          git switch -c "$PR_BRANCH"
-
       - name: Update flake inputs
         run: |
           pushd nix/dev
@@ -47,26 +42,19 @@ jobs:
             --commit-lock-file \
             --commit-lockfile-summary "nix: update flake.lock"
 
-      - name: Make PR if needed
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          if ! git diff --color=always --exit-code origin/main; then
-            git fetch origin "$PR_BRANCH" || true
-            git push --force-with-lease -u origin "$PR_BRANCH"
+      - name: Create PR
+        id: cpr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          base: 'main'
+          branch: 'update-locks'
+          delete-branch: true
+          title: 'chore(nix): update lockfiles'
+          body: 'Automated pull request to update flake locks'
 
-            open_prs="$(gh pr list --base main --head "$PR_BRANCH" | wc -l)"
-            if [ "$open_prs" -eq 0 ]; then
-              gh pr create \
-                --base main \
-                --head "$PR_BRANCH" \
-                --title "chore: update lockfiles" \
-                --fill
-            fi
-          fi
-
-      - name: Enable auto-merge
-        shell: bash
-        run: gh pr merge --auto --squash
-        env:
-          GH_TOKEN: ${{ secrets.MERGE_TOKEN }}
+      - name: Enable Pull Request Automerge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v3
+        with:
+          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+          merge-method: rebase

Cargo.toml

@@ -19,7 +19,7 @@ color-eyre = "0.6.3"
 dotenvy = "0.15.7"
 enum_dispatch = "0.3.13"
 env_logger = "0.11.3"
-eyre = "0.6.11"
+eyre = "0.6.12"
 log = "0.4.21"
 poise = "0.6.1"
 octocrab = "0.38.0"

nix/dev/flake.lock

@@ -40,16 +40,17 @@
     },
     "get-flake": {
       "locked": {
-        "lastModified": 1714237590,
-        "narHash": "sha256-9gtHdGbzFHaR20xORN8IYd67ROWS+1nqQ5CsPf9MD8I=",
+        "lastModified": 1694475786,
+        "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=",
         "owner": "ursi",
         "repo": "get-flake",
-        "rev": "a6c57417d1b857b8be53aba4095869a0f438c502",
+        "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1",
         "type": "github"
       },
       "original": {
         "owner": "ursi",
         "repo": "get-flake",
+        "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1",
         "type": "github"
       }
     },

nix/dev/flake.nix

@@ -8,7 +8,7 @@
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
 
-    get-flake.url = "github:ursi/get-flake";
+    get-flake.url = "github:ursi/get-flake/ac54750e3b95dab6ec0726d77f440efe6045bec1";
 
     pre-commit-hooks = {
       url = "github:cachix/pre-commit-hooks.nix";

renovate.json

@@ -1,4 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:base", "config:recommended"]
+  "extends": ["config:base", "config:recommended", ":automergeMinor"]
 }