Skip to content

Commit

Permalink
Merge branch 'main' into use-mise-env
Browse files Browse the repository at this point in the history
  • Loading branch information
risu729 authored Dec 17, 2024
2 parents f9bc36d + b0a6aac commit a123054
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
matchDepNames: ["mise"],
// cspell:ignore calver
// mise uses Calver, so allow automerge for all versions
// ref: https://mise.jdx.dev/project-roadmap.html#versioning
// ref: https://mise.jdx.dev/roadmap.html#versioning
automerge: true,
},
// set semantic commit types
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install mise
uses: jdx/mise-action@63a673876c7072c1d6ecb2049c0d572976c83b22 # v2.1.7
uses: jdx/mise-action@5bb8f8c1911837cf42064e6490e7634fc842ee7e # v2.1.8
with:
version: 2024.12.8
cache_save: ${{ github.ref_name == 'main' }}
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install mise
uses: jdx/mise-action@63a673876c7072c1d6ecb2049c0d572976c83b22 # v2.1.7
uses: jdx/mise-action@5bb8f8c1911837cf42064e6490e7634fc842ee7e # v2.1.8
with:
version: 2024.12.8
cache_save: ${{ github.ref_name == 'main' }}
Expand All @@ -91,7 +91,7 @@ jobs:
fetch-depth: 0 # fetch all history for commitlint

- name: Install mise
uses: jdx/mise-action@63a673876c7072c1d6ecb2049c0d572976c83b22 # v2.1.7
uses: jdx/mise-action@5bb8f8c1911837cf42064e6490e7634fc842ee7e # v2.1.8
with:
version: 2024.12.8
cache_save: ${{ github.ref_name == 'main' }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
contents: read # for checkout

container:
image: ghcr.io/risu729/dotfiles/wsl:24.04.20241210@sha256:2825cf4030d083bc95c52b40251caf9fb5eb8e33e1d52cee176c64afdecb49a1
image: ghcr.io/risu729/dotfiles/wsl:24.04.20241212@sha256:e9d1d55675aed4bf01aaa15503e9ad5c2af500d05a4cc3fa3e35406839359710

steps:
- name: Run installer
Expand All @@ -35,6 +35,8 @@ jobs:
curl -fsSL https://dot.risunosu.com/wsl?ref=${{
github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha
}} | bash
env:
GITHUB_TOKEN: ${{ github.token }}

actions-timeline:
needs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- run: ls -al

- name: Install mise
uses: jdx/mise-action@63a673876c7072c1d6ecb2049c0d572976c83b22 # v2.1.7
uses: jdx/mise-action@5bb8f8c1911837cf42064e6490e7634fc842ee7e # v2.1.8
with:
version: 2024.12.8
cache_save: ${{ github.ref_name == 'main' }}
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
sparse-checkout-cone-mode: false

- name: Install mise
uses: jdx/mise-action@63a673876c7072c1d6ecb2049c0d572976c83b22 # v2.1.7
uses: jdx/mise-action@5bb8f8c1911837cf42064e6490e7634fc842ee7e # v2.1.8
with:
version: 2024.12.8
cache_save: ${{ github.ref_name == 'main' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wsl-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Install mise
uses: jdx/mise-action@63a673876c7072c1d6ecb2049c0d572976c83b22 # v2.1.7
uses: jdx/mise-action@5bb8f8c1911837cf42064e6490e7634fc842ee7e # v2.1.8
with:
version: 2024.12.8
# cspell:ignore kellyjonbrazil
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
# cspell:ignore buildx
- name: Setup Buildx
if: ${{ steps.rootfs.outcome != 'skipped' }}
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

- name: Build and push Docker image
id: push
Expand Down
Binary file modified bun.lockb
Binary file not shown.
8 changes: 4 additions & 4 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ node = "23.4.0"
# cspell:ignore datasource binstall
# renovate: datasource=crate
cargo-binstall = "1.10.11"
uv = "0.5.8"
uv = "0.5.9"
"aqua:biomejs/biome" = "1.9.4"
actionlint = "1.7.4"
# renovate: extractVersion=^v(?<version>.+)
Expand All @@ -25,10 +25,10 @@ shfmt = "3.10.0"
shellcheck = "0.10.0"
yamlfmt = "0.14.0"
yamllint = "1.35.1"
"npm:renovate" = "39.63.1"
"npm:cspell" = "8.16.1"
"npm:renovate" = "39.70.0"
"npm:cspell" = "8.17.1"
"cargo:lychee" = "0.17.0"
typos = "1.28.3"
typos = "1.28.4"
"npm:ignore-sync" = "7.0.1"

[settings]
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"$schema": "https://json.schemastore.org/package.json",
"name": "@risu729/dotfiles",
"devDependencies": {
"@commitlint/cli": "19.6.0",
"@commitlint/cli": "19.6.1",
"@commitlint/config-conventional": "19.6.0",
"@commitlint/cz-commitlint": "19.5.0",
"@commitlint/cz-commitlint": "19.6.1",
"@commitlint/types": "19.5.0",
"@cspell/cspell-types": "8.16.1",
"@cspell/cspell-types": "8.17.1",
"@tsconfig/bun": "1.0.7",
"@tsconfig/strictest": "2.0.5",
"@types/bun": "1.1.14",
Expand Down
Binary file modified worker/bun.lockb
Binary file not shown.
8 changes: 4 additions & 4 deletions worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"name": "@risu729/dotfiles-worker",
"type": "module",
"dependencies": {
"hono": "4.6.13",
"hono": "4.6.14",
"zod": "3.24.1"
},
"scripts": {
"deploy": "wrangler deploy $(../mise-tasks/worker/wrangler-args)"
},
"devDependencies": {
"@cloudflare/vitest-pool-workers": "0.5.36",
"@cloudflare/workers-types": "4.20241205.0",
"@cloudflare/vitest-pool-workers": "0.5.37",
"@cloudflare/workers-types": "4.20241216.0",
"@total-typescript/tsconfig": "1.0.4",
"@tsconfig/bun": "1.0.7",
"@tsconfig/strictest": "2.0.5",
Expand All @@ -22,6 +22,6 @@
"execa": "9.5.2",
"typescript": "5.7.2",
"vitest": "2.1.8",
"wrangler": "3.95.0"
"wrangler": "3.96.0"
}
}
6 changes: 3 additions & 3 deletions wsl/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ cd "${HOME}"

mise trust --all
mise install --yes
# activate mise shims for bun scripts
mise_shims="$(mise activate bash --shims)"
eval "${mise_shims}"
# activate to use installed tools in setup-git.ts
mise_activate="$(mise activate bash)"
eval "${mise_activate}"
echo installed mise

echo installed dotfiles!
Expand Down

0 comments on commit a123054

Please sign in to comment.