ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into objc-intrinsics

Browse Source
This commit is contained in:
gingerBill
2022-02-12 21:49:48 +00:00
parent e2aa8f426d 1c57d1c019
commit b8479ea79d
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -79,7 +79,7 @@ jobs:
make make
timeout-minutes: 10 timeout-minutes: 10
build_windows: build_windows:
runs-on: windows-latest runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: build Odin - name: build Odin
.github/workflows/nightly.yml
+1 -1
View File
@@ -7,7 +7,7 @@ on:
jobs: jobs:
build_windows: build_windows:
runs-on: windows-latest runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: build Odin - name: build Odin
core/path/filepath/match.odin
+1 -2
View File
@@ -227,11 +227,10 @@ glob :: proc(pattern: string, allocator := context.allocator) -> (matches: []str
return m[:], .None return m[:], .None
} }
temp_buf: [8]byte
dir, file := split(pattern) dir, file := split(pattern)
volume_len := 0 volume_len := 0
when ODIN_OS == "windows" { when ODIN_OS == "windows" {
temp_buf: [8]byte
volume_len, dir = clean_glob_path_windows(dir, temp_buf[:]) volume_len, dir = clean_glob_path_windows(dir, temp_buf[:])
} else { } else {
dir = clean_glob_path(dir) dir = clean_glob_path(dir)