Merge branch 'main' into update-lychee-config

risu729 · Jan 12, 2025 · 825552d · 825552d
2 parents 3434d43 + 9bc20e4
commit 825552d
Show file tree

Hide file tree

Showing 12 changed files with 257 additions and 25 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -1,7 +1,7 @@
 {
 	// ref: https://docs.renovatebot.com/configuration-options/
 	$schema: "https://docs.renovatebot.com/renovate-schema.json",
-	extends: ["github>risu729/renovate-config#3.0.1"],
+	extends: ["github>risu729/renovate-config#3.1.0"],
 	packageRules: [
 		// set semantic commit types
 		{

diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -74,7 +74,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -100,7 +100,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
       contents: read # for checkout
 
     container:
-      image: ghcr.io/risu729/dotfiles/wsl:24.04.20250106@sha256:6c78914113f1b31afaac1395520859c459018d1aed16232f11f193ac8c7aef7b
+      image: ghcr.io/risu729/dotfiles/wsl:24.04.20250109@sha256:13649e38dd4031a6a11e7166da6f3d23a9beec672bf67c72f9b8c542daa5ebda
 
     steps:
       - name: Run installer

diff --git a/.github/workflows/worker.yml b/.github/workflows/worker.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -70,29 +70,56 @@ jobs:
             worker/*
           sparse-checkout-cone-mode: false
           persist-credentials: false
+          # set fetch-depth to 2 for pull requests to get the head commit, not only the merge commit
+          fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 1 }}
 
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           cache_save: ${{ github.ref_name == 'main' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Install package.json dependencies
-        run: mise run buni:worker
-
       - name: Get Wrangler args
         id: wrangler-args
         run: |
           args=$(mise run worker:wrangler-args)
           echo "args=${args}" >> "${GITHUB_OUTPUT}"
 
-      - name: Deploy to Cloudflare workers with Wrangler
+      - name: Get Commit SHA and Message
+        id: commit
+        run: |
+          sha=${{ github.event.pull_request.head.sha || github.sha }}
+          short_sha=$(git rev-parse --short "${sha}")
+          message=$(git log --format=%B --max-count=1 "${sha}")
+          echo "short_sha=${short_sha}" >> "${GITHUB_OUTPUT}"
+          echo "message=${message}" >> "${GITHUB_OUTPUT}"
+
+      - name: Upload a Version of Cloudflare Workers with Wrangler
+        id: deploy
         uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3.13.0
         with:
           workingDirectory: worker
-          command: deploy --dry-run ${{ steps.wrangler-args.outputs.args }}
+          # tag length is limited to 25 characters
+          command: >-
+            versions upload --tag ${{ steps.commit.outputs.short_sha }}
+            --message "${{ steps.commit.outputs.message }}"
+            ${{ steps.wrangler-args.outputs.args }}
+          apiToken: ${{ secrets.CLOUDFLARE_WORKERS_API_TOKEN }}
+          accountId: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
+
+      - name: Generate Job Summary
+        run: |
+          worker_name=$(echo '${{ steps.deploy.outputs.command-output }}' \
+            | grep --only-matching --perl-regexp '^Uploaded \K[^ ]+')
+          version_id=$(echo '${{ steps.deploy.outputs.command-output }}' \
+            | grep --only-matching --perl-regexp '^Worker Version ID: \K.+')
+          preview_url=$(echo '${{ steps.deploy.outputs.command-output }}' \
+            | grep --only-matching --perl-regexp '^Version Preview URL: \K.+')
+          echo "# ${worker_name}
+          - Version ID: ${version_id}
+          - Preview URL: ${preview_url}" >> "${GITHUB_STEP_SUMMARY}"
 
   actions-timeline:
     needs:

diff --git a/.github/workflows/wsl-docker.yml b/.github/workflows/wsl-docker.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@5083fe46898c414b2475087cc79da59e7da859e8 # v2.1.11
         with:
-          version: 2025.1.3
+          version: 2025.1.4
           # cspell:ignore kellyjonbrazil
           mise_toml: |
             [tools]

diff --git a/.gitignore-sync b/.gitignore-sync
@@ -1,7 +1,7 @@
 # ref: https://github.com/foray1010/ignore-sync?tab=readme-ov-file#how-to-use
 
 [oven-sh/bun]
-src/cli/gitignore-for-init
+src/cli/init/gitignore.default
 
 [inline]
 .cspellcache

diff --git a/mise.toml b/mise.toml
@@ -1,7 +1,7 @@
 # ref: https://mise.jdx.dev/configuration.html
 #:schema https://mise.jdx.dev/schema/mise.json
 
-min_version = "2025.1.3"
+min_version = "2025.1.4"
 
 [tools]
 bun = "1.1.43"
@@ -16,7 +16,7 @@ taplo = "0.9.3"
 markdownlint-cli2 = "0.17.1"
 shfmt = "3.10.0"
 shellcheck = "0.10.0"
-yamlfmt = "0.14.0"
+yamlfmt = "0.15.0"
 yamllint = "1.35.1"
 "npm:cspell" = "8.17.1"
 "cargo:lychee" = "0.18.0"