From bcff1d42b05a9c3472717590d1a8dc920ca781ae Mon Sep 17 00:00:00 2001 From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> Date: Thu, 28 May 2026 14:33:57 +0200 Subject: [PATCH] chore: migrate more make targets (#28663) --- Makefile | 39 +++++++++++++++------------------------ e2e/mise.toml | 17 ++++++++++++++++- mise.toml | 11 +++++++++++ 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index b7f992982d..eb8bad09f3 100644 --- a/Makefile +++ b/Makefile @@ -1,46 +1,46 @@ dev: - @printf "This command has been removed. Please use:\n\n mise dev # or mise //:dev from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise dev # or mise //:dev from another directory\n\n" >&2 && exit 1 dev-down: - @printf "This command has been removed. Please use:\n\n mise dev-down # or mise //:dev-down from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise dev-down # or mise //:dev-down from another directory\n\n" >&2 && exit 1 dev-update: - @printf "This command has been removed. Please use:\n\n mise dev-update # or mise //:dev-update from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise dev-update # or mise //:dev-update from another directory\n\n" >&2 && exit 1 dev-scale: - @printf "This command has been removed. Please use:\n\n mise dev-scale # or mise //:dev-scale from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise dev-scale # or mise //:dev-scale from another directory\n\n" >&2 && exit 1 dev-docs: npm --prefix docs run start .PHONY: e2e e2e: - @printf "This command has been removed. Please use:\n\n mise e2e # or mise //:e2e from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise e2e # or mise //:e2e from another directory\n\n" >&2 && exit 1 e2e-dev: - @printf "This command has been removed. Please use:\n\n mise e2e-dev # or mise //:e2e-dev from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise e2e-dev # or mise //:e2e-dev from another directory\n\n" >&2 && exit 1 e2e-update: - @printf "This command has been removed. Please use:\n\n mise e2e-update # or mise //:e2e-update from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise e2e-update # or mise //:e2e-update from another directory\n\n" >&2 && exit 1 e2e-down: - @printf "This command has been removed. Please use:\n\n mise e2e-down # or mise //:e2e-down from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise e2e-down # or mise //:e2e-down from another directory\n\n" >&2 && exit 1 prod: - @printf "This command has been removed. Please use:\n\n mise prod # or mise //:prod from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise prod # or mise //:prod from another directory\n\n" >&2 && exit 1 prod-down: - @printf "This command has been removed. Please use:\n\n mise prod-down # or mise //:prod-down from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise prod-down # or mise //:prod-down from another directory\n\n" >&2 && exit 1 prod-scale: - @printf "This command has been removed. Please use:\n\n mise prod-scale # or mise //:prod-scale from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise prod-scale # or mise //:prod-scale from another directory\n\n" >&2 && exit 1 .PHONY: open-api open-api: - @printf "This command has been removed. Please use:\n\n mise open-api # or mise //:open-api from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise open-api # or mise //:open-api from another directory\n\n" >&2 && exit 1 sql: - @printf "This command has been removed. Please use:\n\n mise sql # or mise //:sql from another directory\n\n"\n\n >&2 && exit 1 + @printf "This command has been removed. Please use:\n\n mise sql # or mise //:sql from another directory\n\n" >&2 && exit 1 renovate: @@ -52,16 +52,7 @@ renovate: MODULES = e2e server web cli sdk docs .github test-e2e: - docker compose -f ./e2e/docker-compose.yml build - pnpm --filter immich-e2e run test - pnpm --filter immich-e2e run test:web + @printf "This command has been removed. Please use:\n\n mise //e2e:test # or mise //e2e:test-web for web tests, respectively\n\n" >&2 && exit 1 clean: - find . -name "node_modules" -type d -prune -exec rm -rf {} + - find . -name "dist" -type d -prune -exec rm -rf '{}' + - find . -name "build" -type d -prune -exec rm -rf '{}' + - find . -name ".svelte-kit" -type d -prune -exec rm -rf '{}' + - find . -name "coverage" -type d -prune -exec rm -rf '{}' + - find . -name ".pnpm-store" -type d -prune -exec rm -rf '{}' + - command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml down -v --remove-orphans || true - command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml down -v --remove-orphans || true + @printf "This command has been removed. Please use:\n\n mise clean # or mise //:clean from another directory\n\n" >&2 && exit 1 diff --git a/e2e/mise.toml b/e2e/mise.toml index 99056f9ead..b149922564 100644 --- a/e2e/mise.toml +++ b/e2e/mise.toml @@ -1,11 +1,21 @@ [tasks.install] run = "pnpm install --filter immich-e2e --frozen-lockfile" +[tasks.build] +dir = "{{ config_root }}" +run = "docker compose build" + [tasks.test] +depends = ["//e2e:build", "//e2e:ci-setup"] env._.path = "./node_modules/.bin" run = "vitest --run" +[tasks.playwright-install] +env._.path = "./node_modules/.bin" +run = "playwright install" + [tasks."test-web"] +depends = ["//e2e:build", "//e2e:ci-setup", "//e2e:playwright-install"] env._.path = "./node_modules/.bin" run = "playwright test" @@ -30,7 +40,12 @@ run = "tsc --noEmit" [tasks.ci-setup] -depends = ["//:sdk:install", "//:sdk:build", "//cli:install", "//cli:build"] +depends = [ + "//:sdk:install", + "//:sdk:build", + "//packages/cli:install", + "//packages/cli:build", +] run = { task = ":install" } diff --git a/mise.toml b/mise.toml index fb09da78a5..5659aacb6c 100644 --- a/mise.toml +++ b/mise.toml @@ -165,3 +165,14 @@ run = "pnpm format" [tasks."i18n:format-fix"] run = "pnpm format:fix" + +[tasks.clean] +run = [ + "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +", + "find . -name 'dist' -type d -prune -exec rm -rf '{}' +", + "find . -name 'build' -type d -prune -exec rm -rf '{}' +", + "find . -name '.svelte-kit' -type d -prune -exec rm -rf '{}' +", + "find . -name 'coverage' -type d -prune -exec rm -rf '{}' +", + "find . -name '.pnpm-store' -type d -prune -exec rm -rf '{}' +", + { task = "//:*-down" }, +]