Skip to content

Commit f4e769d

Browse files
committed
Merge branch 'rc-0.1.13'
2 parents 6bd633f + 3f5f867 commit f4e769d

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/onyx-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
cmd.exe /c 'build.bat dist'
224224
225225
- name: Upload Artifacts
226-
uses: actions/upload-artifact@v3
226+
uses: actions/upload-artifact@v4
227227
with:
228228
name: ${{ matrix.artifact_name }}
229229
path: dist
@@ -245,7 +245,7 @@ jobs:
245245
upload_url: ${{ steps.create_release.outputs.upload_url }}
246246
steps:
247247
- name: Download artifacts
248-
uses: actions/download-artifact@v2
248+
uses: actions/download-artifact@v4
249249
with:
250250
path: artifacts
251251
- name: Create Release

core/alloc/alloc.onyx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ package core.alloc
99
#load "./logging"
1010
#load "./gc"
1111
#load "./debug"
12-
#load "./memwatch"
12+
13+
use runtime
14+
#if runtime.runtime == .Onyx {
15+
#load "./memwatch"
16+
}
1317

1418
use core.memory
1519
use core.intrinsics.types {type_is_function}
@@ -112,4 +116,4 @@ report_leaks_in_scope :: macro () {
112116
__old_allocator := context.allocator
113117
context.allocator = alloc.as_allocator(&__ha)
114118
defer context.allocator = __old_allocator
115-
}
119+
}

core/os/dir.onyx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ DirectoryEntry :: struct {
1717
identifier : u32;
1818
name_length : u32;
1919
name_data : [256] u8;
20-
21-
2220
}
2321

2422
/// Returns the `str` of the name, pointing into the `DirectoryEntry` for data.

0 commit comments

Comments
 (0)