Merge pull request #2030 from zawata/add-macos-prebuilts

zawata · web-flow · commit b47b7fcb6d72 · 2025-11-21T21:48:51.000-07:00
add macos arm64 tests and prebuilts
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -72,10 +72,9 @@ jobs:
     strategy:
       matrix:
         node: [20, 22, 24]
+        arch: [x64, arm64]
       fail-fast: false
-    runs-on: macOS-13
-    # This is mostly the same as the Linux steps, waiting for anchor support
-    # https://github.com/actions/runner/issues/1182
+    runs-on: ${{ matrix.arch == 'x64' && 'macos-15-intel' || 'macos-15' }}
     steps:
       - uses: actions/checkout@v4
 
diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json
@@ -2444,12 +2444,6 @@
           }
         }
       ],
-      [
-        "git_time_t",
-        {
-          "type": "enum"
-        }
-      ],
       [
         "git_trace_level_t",
         {
diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -25,7 +25,8 @@ var cTypeMappings = {
   "uint32_t": "Number",
   "uint64_t": "Number",
   "double": "Number",
-  "git_object_size_t": "Number"
+  "git_object_size_t": "Number",
+  "git_time_t": "Number",
 }
 
 var collisionMappings = {
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -286,7 +286,7 @@ describe("Commit", function() {
 
   it("can amend commit", function(){
     var commitToAmendId = "315e77328ef596f3bc065d8ac6dd2c72c09de8a5";
-    var expectedAmendedCommitId = "57836e96555243666ea74ea888310cc7c41d4613";
+    var expectedAmendedCommitId = "a41de0d1c3dc169c873dd03bd9240d9f88e60ffc";
     var fileName = "newfile.txt";
     var fileContent = "hello world";
     var newFileName = "newerfile.txt";

Original file line number	Diff line number	Diff line change
`@@ -2444,12 +2444,6 @@`
`2444`	`2444`	`}`
`2445`	`2445`	`}`
`2446`	`2446`	`],`
`2447`		`- [`
`2448`		`- "git_time_t",`
`2449`		`- {`
`2450`		`- "type": "enum"`
`2451`		`- }`
`2452`		`- ],`
`2453`	`2447`	`[`
`2454`	`2448`	`"git_trace_level_t",`
`2455`	`2449`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ var cTypeMappings = {`
`25`	`25`	`"uint32_t": "Number",`
`26`	`26`	`"uint64_t": "Number",`
`27`	`27`	`"double": "Number",`
`28`		`- "git_object_size_t": "Number"`
	`28`	`+ "git_object_size_t": "Number",`
	`29`	`+ "git_time_t": "Number",`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`var collisionMappings = {`