Skip to content

Commit 3afec96

Browse files
Merge branch 'master' into fix_doc_update
2 parents 170e491 + 807ae52 commit 3afec96

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
matrix:
2626
include:
2727
- { os: ubuntu-22.04, target: linux, platform: linux-x64, container: 'alpine:latest', libc: musl }
28-
- { os: ubuntu-20.04, target: linux, platform: linux-x64 }
29-
- { os: ubuntu-20.04, target: linux, platform: linux-arm64 }
28+
- { os: ubuntu-22.04, target: linux, platform: linux-x64 }
29+
- { os: ubuntu-22.04, target: linux, platform: linux-arm64 }
3030
- { os: macos-latest, target: darwin, platform: darwin-x64 }
3131
- { os: macos-latest, target: darwin, platform: darwin-arm64 }
3232
- { os: windows-latest, target: windows, platform: win32-ia32 }

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
fail-fast: false
77
matrix:
88
include:
9-
- { os: ubuntu-20.04, target: linux, platform: linux-x64 }
9+
- { os: ubuntu-22.04, target: linux, platform: linux-x64 }
1010
- { os: macos-14, target: darwin, platform: darwin-arm64 }
1111
- { os: windows-latest, target: windows, platform: win32-x64 }
1212
runs-on: ${{ matrix.os }}

changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<!-- Add all new changes here. They will be moved under a version at release -->
55
* `FIX` incorrect argument skip pattern for `--check_out_path=`, which incorrectly skips the next argument
66
* `FIX` incorrect error message for `--doc_update`.
7+
* `FIX` remove extra `./` path prefix in the check report when using `--check=.`
78

89
## 3.13.6
910
`2025-2-6`

script/cli/check_worker.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ function export.runCLI()
187187
return
188188
end
189189

190-
local rootPath = fs.absolute(fs.path(CHECK_WORKER)):string()
190+
local rootPath = fs.canonical(fs.path(CHECK_WORKER)):string()
191191
local rootUri = furi.encode(rootPath)
192192
if not rootUri then
193193
print(lang.script('CLI_CHECK_ERROR_URI', rootPath))

0 commit comments

Comments
 (0)