From 9d6fed966b3d7570c8d216849b839b26c01f7d2c Mon Sep 17 00:00:00 2001 From: John Alden Date: Mon, 17 Nov 2025 15:44:00 -0700 Subject: [PATCH 1/2] add macos arm64 tests and prebuilts --- .github/workflows/tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 218fca650..3cd6aae10 100644 --- 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 From d8db070d7456768675ed9aa811d8e55523539ab8 Mon Sep 17 00:00:00 2001 From: John Alden Date: Fri, 21 Nov 2025 15:38:52 -0700 Subject: [PATCH 2/2] fix incorrect git_time_t narrowing --- generate/input/libgit2-supplement.json | 6 ------ generate/scripts/helpers.js | 3 ++- test/tests/commit.js | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json index 742216f03..12ee8945b 100644 --- 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 index 15790983f..e278e1cc0 100644 --- 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 index 69868333c..8ff9b8ea7 100644 --- 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";