diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2aa46c9..f04a5c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,10 +23,10 @@ jobs: os: ubuntu-22.04 target: x86_64-unknown-linux-musl - build: macos-x86_64 - os: macos-13 + os: macos-15-intel target: x86_64-apple-darwin - build: macos-aarch64 - os: macos-14 + os: macos-15 target: aarch64-apple-darwin - build: win-msvc os: windows-2022 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 188f395..5d5a841 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,8 +20,7 @@ jobs: strategy: fail-fast: false matrix: - # macos-13 is x86; macos-14 is ARM - os: [ubuntu-latest, macos-13, macos-14, windows-latest] + os: [ubuntu-latest, macos-15, macos-15-intel, windows-latest] cargo_flags: [""] include: - os: ubuntu-latest diff --git a/package-lock.json b/package-lock.json index 343561b..9c4f35f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -981,12 +981,12 @@ } }, "node_modules/@tauri-apps/plugin-process": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-process/-/plugin-process-2.3.0.tgz", - "integrity": "sha512-0DNj6u+9csODiV4seSxxRbnLpeGYdojlcctCuLOCgpH9X3+ckVZIEj6H7tRQ7zqWr7kSTEWnrxtAdBb0FbtrmQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-process/-/plugin-process-2.3.1.tgz", + "integrity": "sha512-nCa4fGVaDL/B9ai03VyPOjfAHRHSBz5v6F/ObsB73r/dA3MHHhZtldaDMIc0V/pnUw9ehzr2iEG+XkSEyC0JJA==", "license": "MIT OR Apache-2.0", "dependencies": { - "@tauri-apps/api": "^2.6.0" + "@tauri-apps/api": "^2.8.0" } }, "node_modules/@types/codemirror": { @@ -1384,9 +1384,9 @@ } }, "node_modules/vite": { - "version": "7.1.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.9.tgz", - "integrity": "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==", + "version": "7.1.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz", + "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==", "dev": true, "license": "MIT", "dependencies": { @@ -1532,10 +1532,10 @@ }, "webapp": { "name": "diffedit3-webapp", - "version": "0.6.0", + "version": "0.6.1", "dependencies": { "@tauri-apps/api": "^2.8.0", - "@tauri-apps/plugin-process": "^2.3.0", + "@tauri-apps/plugin-process": "^2.3.1", "codemirror": "^5.65", "diff_match_patch": "^0.1.1", "lit-html": "^3.3.1" @@ -1546,7 +1546,7 @@ "@types/diff-match-patch": "^1.0.36", "prettier": "3.6.2", "typescript": "^5.9.3", - "vite": "^7.1.9", + "vite": "^7.1.12", "vite-plugin-checker": "^0.11.0" } } diff --git a/src/bin/diffedit3.rs b/src/bin/diffedit3.rs index 48d0928..177d3e5 100644 --- a/src/bin/diffedit3.rs +++ b/src/bin/diffedit3.rs @@ -7,6 +7,8 @@ use tracing_subscriber::util::SubscriberInitExt as _; type PortRange = std::ops::RangeInclusive; /// Compare three directories in a browser and allow editing one of them +/// +/// See https://github.com/ilyagr/diffedit3 for more info. #[derive(Parser)] #[command(version, about)] pub struct LocalServerCli { diff --git a/webapp/package.json b/webapp/package.json index c402285..ab1ed62 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "@tauri-apps/api": "^2.8.0", - "@tauri-apps/plugin-process": "^2.3.0", + "@tauri-apps/plugin-process": "^2.3.1", "codemirror": "^5.65", "diff_match_patch": "^0.1.1", "lit-html": "^3.3.1" @@ -16,7 +16,7 @@ "@types/diff-match-patch": "^1.0.36", "prettier": "3.6.2", "typescript": "^5.9.3", - "vite": "^7.1.9", + "vite": "^7.1.12", "vite-plugin-checker": "^0.11.0" } }