Merge remote-tracking branch 'origin/main' into refactor-plugins

.github/workflows/docker.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -72,7 +72,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -85,12 +85,19 @@ jobs:
     container:
       image: ghcr.io/jdx/mise:dev
     needs: [dev]
+    env:
+      GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - run: cargo install --path . --debug
       - run: mise trust --all
       - run: mise install -y
-      - run: mise run test
+      - name: mise run test
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 3
+          command: mise run test
   dockerhub:
     runs-on: ubuntu-latest
     steps:
@@ -110,7 +117,7 @@ jobs:
         with:
           images: jdxcode/mise
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile

.github/workflows/docs.yml

@@ -0,0 +1,42 @@
+name: mise-docs
+
+on:
+  push:
+    paths:
+      - "docs/**"
+    branches:
+      - main
+  pull_request:
+    paths:
+      - "docs/**"
+    branches:
+      - main
+
+concurrency:
+  group: mise-docs-release-${{ github.head_ref }}
+  cancel-in-progress: true
+
+env:
+  MISE_EXPERIMENTAL: 1
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # for lastUpdated
+      - uses: jdx/mise-action@v2
+        with:
+          install_args: bun
+          working_directory: docs
+      - run: bun install
+        working-directory: docs
+      - run: bun run docs:build
+        working-directory: docs
+      - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: mise run release-docs
+        working-directory: docs
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }}

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: release
 on:
   push:
     tags: ["v*"]
-    branches: ["release", "win"]
+    branches: ["release", "win", "docs"]
   workflow_dispatch:
 
 concurrency:
@@ -250,20 +250,18 @@ jobs:
       - build-tarball-win
     steps:
       - uses: actions/checkout@v4
+      - uses: crazy-max/ghaction-import-gpg@v6
         with:
-          path: mise
-      - uses: actions/checkout@v4
-        with:
-          repository: jdx/mise-docs
-          path: mise-docs
-          token: ${{ secrets.RTX_GITHUB_BOT_TOKEN }}
+          gpg_private_key: ${{ secrets.MISE_GPG_KEY }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
       - name: cache zipsign
         id: cache-zipsign
         uses: actions/cache@v4
         with:
           path: ~/.cargo/bin/zipsign
           key: cargo-zipsign
-      - run: ./mise/scripts/setup-zipsign.sh
+      - run: ./scripts/setup-zipsign.sh
         env:
           ZIPSIGN: ${{ secrets.ZIPSIGN }}
       - name: Install fd-find
@@ -281,12 +279,6 @@ jobs:
         with:
           key: ${{ secrets.RTX_SSH_KEY }}
           known_hosts: ${{ secrets.RTX_KNOWN_HOSTS_AUR }}
-      - uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.MISE_GPG_KEY }}
-          git_user_signingkey: true
-          git_commit_gpgsign: true
-          workdir: mise-docs
       - uses: actions/download-artifact@v4
         with: { path: artifacts }
       - run: ls -R artifacts
@@ -299,16 +291,13 @@ jobs:
             mise-v*.zip
           merge-multiple: true
       - run: ls -R artifacts
-      - run: mise/scripts/release.sh
+      - run: scripts/release.sh
         env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           CLOUDFLARE_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }}
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
           CLOUDFLARE_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }}
-      - name: mise-docs push
-        if: startsWith(github.event.ref, 'refs/tags/v')
-        run: git push
-        working-directory: mise-docs
+          GITHUB_TOKEN: ${{ secrets.RTX_GITHUB_BOT_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: GitHub Release Assets
         uses: softprops/action-gh-release@v2
         if: startsWith(github.event.ref, 'refs/tags/v')
@@ -362,14 +351,15 @@ jobs:
     runs-on: ubuntu-22.04
     container: ghcr.io/jdx/mise:alpine
     timeout-minutes: 30
-    needs: [e2e-linux]
-    if: startsWith(github.event.ref, 'refs/tags/v')
+    needs: [release]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Bump APKBUILD
         run: sudo -Eu packager ./scripts/release-alpine.sh
         env:
-          ALPINE_PUB_KEY: ${{ secrets.ALPINE_PUB_KEY }}
+          ALPINE_GITLAB_TOKEN: ${{ secrets.ALPINE_GITLAB_TOKEN }}
+          ALPINE_KEY_ID: ${{ secrets.ALPINE_KEY_ID }}
           ALPINE_PRIV_KEY: ${{ secrets.ALPINE_PRIV_KEY }}
-          GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
+          ALPINE_PUB_KEY: ${{ secrets.ALPINE_PUB_KEY }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.markdownlint.json

@@ -1,6 +1,7 @@
 {
   "MD004": false,
   "MD013": false,
+  "MD029": false,
   "MD033": false,
   "MD040": false,
   "MD041": false

.mise/tasks/release-docs

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -xeuo pipefail
+
+export AWS_REGION=auto
+export AWS_ENDPOINT_URL=https://6e243906ff257b965bcae8025c2fc344.r2.cloudflarestorage.com
+
+bun run docs:build
+
+if [ $((RANDOM % 30)) -eq 0 ]; then
+  # delete old assets only roughly 1/30 times
+  # deleting old assets can break the site for people currently on it
+  # but it's also good to keep things tidy
+  aws s3 rm --recursive s3://mise/assets/
+  aws s3 rm --recursive --exclude "*" --include "*.html" s3://mise/
+fi
+
+aws s3 cp --recursive .vitepress/dist s3://mise/

.mise/tasks/release-plz

@@ -13,7 +13,7 @@ if ! echo "$released_versions" | grep -q "^$cur_version$"; then
   changelog="$(echo "$changelog" | tail -n +3)"
   git tag "v$cur_version" -s -m "$changelog"
   git push --tags
-  gh release create "v$cur_version" --title "v$cur_version" --notes "$changelog"
+  gh release create "v$cur_version" --title "v$cur_version" --notes "$changelog" --draft
   exit 0
 fi