Merge branch 'rc-0.1.13'

onyx-lang · Nov 9, 2024 · f4e769d · f4e769d
2 parents 6bd633f + 3f5f867
commit f4e769d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/onyx-build.yml b/.github/workflows/onyx-build.yml
@@ -223,7 +223,7 @@ jobs:
           cmd.exe /c 'build.bat dist'
       
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact_name }}
           path: dist
@@ -245,7 +245,7 @@ jobs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Create Release

diff --git a/core/alloc/alloc.onyx b/core/alloc/alloc.onyx
@@ -9,7 +9,11 @@ package core.alloc
 #load "./logging"
 #load "./gc"
 #load "./debug"
-#load "./memwatch"
+
+use runtime
+#if runtime.runtime == .Onyx {
+    #load "./memwatch"
+}
 
 use core.memory
 use core.intrinsics.types {type_is_function}
@@ -112,4 +116,4 @@ report_leaks_in_scope :: macro () {
     __old_allocator := context.allocator
     context.allocator = alloc.as_allocator(&__ha)
     defer context.allocator = __old_allocator
-}
+}
diff --git a/core/os/dir.onyx b/core/os/dir.onyx
@@ -17,8 +17,6 @@ DirectoryEntry :: struct {
     identifier  : u32;
     name_length : u32;
     name_data   : [256] u8;
-
-
 }
 
 /// Returns the `str` of the name, pointing into the `DirectoryEntry` for data.