@swimlane/nodegit 1.1.5 → 2.0.4

package/.commitlintrc.yml

@@ -0,0 +1,12 @@
+extends:
+  - "@commitlint/config-conventional"
+rules:
+  header-max-length:
+    - 2
+    - "always"
+    - 200
+  body-max-line-length:
+    - 1
+    - "always"
+    - "Infinity"
+

package/.github/workflows/lint-pr.yml

@@ -0,0 +1,19 @@
+name: "Lint PR"
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  main:
+    uses: "swimlane/shared-workflows/.github/workflows/lint-pr.yml@v3"
+    secrets:
+        GH_APP_ID: ${{ secrets.GH_APP_ID }}
+        GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}

package/.github/workflows/publish.yml

@@ -1,9 +1,14 @@
+name: Publish
 on:
   push:
     tags:
       - v*
   workflow_dispatch:
 
+concurrency:
+  group: publish-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     # TODO: should we run the tests, or can we assume that a v* tag ought to
@@ -11,20 +16,14 @@ jobs:
     name: build
     strategy:
       matrix:
-        node: [20.0.0]
+        node: [24.x]
         os:
           # macos-14 is arm64 (m1)
           - name: darwin
             host: macos-14
 
-          # macos-13 is x86
-          - name: mac-x64
-            host: macos-13
-
-          # ubuntu-20.04 is x86. Still no arm linux runners yet
-          # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
-          - name: linux
-            host: ubuntu-20.04
+          - name: linux-amd
+            host: ubuntu-24.04
     env:
       CC: clang
       CXX: clang++
@@ -37,7 +36,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.0.0
+          node-version: ${{ matrix.node }}
           check-latest: true
       - name: Prebuildify
         run: |
@@ -53,40 +52,57 @@ jobs:
           path: ./prebuilds
           retention-days: 14
 
-  cross-compile:
-    name: "cross compile linux/arm"
-    runs-on: ubuntu-20.04
+  build-linux-glibc-arm:
+    name: "Build Linux glibc ARM"
+    runs-on: large-arm-on-demand
     steps:
       - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
+        with:
+          submodules: true
       - name: build linux glibc arm
         run: |
           docker build --platform=linux/arm64 --tag nodegit-linux-glibc-arm64 -f scripts/Dockerfile.debian .
           docker create --platform=linux/arm64 --name nodegit-linux-glibc-arm64 nodegit-linux-glibc-arm64
           docker cp "nodegit-linux-glibc-arm64:/app/prebuilds" .
+      - name: "list the generated files"
+        run: find prebuilds
+      - uses: actions/upload-artifact@v4
+        with:
+          name: prebuild-linux-arm64
+          path: ./prebuilds
+          retention-days: 14
+
+  build-linux-musl-x64:
+    name: "Build Linux musl x64"
+    runs-on: large-amd-on-demand
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
       - name: build linux musl x64
         run: |
           docker build --platform=linux/amd64 --tag nodegit-linux-musl-amd64 -f scripts/Dockerfile.alpine .
           docker create --platform=linux/amd64 --name nodegit-linux-musl-amd64 nodegit-linux-musl-amd64
           docker cp "nodegit-linux-musl-amd64:/app/prebuilds" .
-      # - name: build linux musl arm
-      #   run: |
-      #     docker build --platform=linux/arm64 --tag nodegit-linux-musl-arm64 -f scripts/Dockerfile.alpine .
-      #     docker create --platform=linux/arm64 --name nodegit-linux-musl-arm64 nodegit-linux-musl-arm64
-      #     docker cp "nodegit-linux-musl-arm64:/app/prebuilds" .
       - name: "list the generated files"
         run: find prebuilds
       - uses: actions/upload-artifact@v4
         with:
-          name: prebuild-linux-arm64
+          name: prebuild-linux-amd64
           path: ./prebuilds
           retention-days: 14
 
+
   # https://docs.npmjs.com/generating-provenance-statements#publishing-packages-with-provenance-via-github-actions
-  publish:
+  publish-npm:
+    if: github.event_name != 'workflow_dispatch'
     runs-on: ubuntu-latest
-    needs: [build, cross-compile]
+    needs:
+      - build
+      - build-linux-glibc-arm
+      - build-linux-musl-x64
     permissions:
+      contents: read
       id-token: write
     steps:
       - uses: actions/checkout@v4
@@ -94,7 +110,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24.x
           check-latest: true
           registry-url: "https://registry.npmjs.org"
           scope: "swimlane"
@@ -113,9 +129,8 @@ jobs:
           find ${{ steps.download.outputs.download-path }}
           mv ${{ steps.download.outputs.download-path}}/prebuild-Linux-X64/linux-x64/* ./prebuilds/linux-x64/
           mv ${{ steps.download.outputs.download-path}}/prebuild-linux-arm64/linux-arm64/* ./prebuilds/linux-arm64/
-          mv ${{ steps.download.outputs.download-path}}/prebuild-linux-arm64/linux-x64/* ./prebuilds/linux-x64/
+          mv ${{ steps.download.outputs.download-path}}/prebuild-linux-amd64/linux-x64/* ./prebuilds/linux-x64/
           mv ${{ steps.download.outputs.download-path}}/prebuild-macOS-ARM64/darwin-arm64/* ./prebuilds/darwin-arm64/
-          mv ${{ steps.download.outputs.download-path}}/prebuild-macOS-X64/darwin-x64/* ./prebuilds/darwin-x64/
           find ./prebuilds
       - name: npm install
         run: npm ci --ignore-scripts
@@ -123,6 +138,56 @@ jobs:
         run: npm run preinstall
       - name: publish
         run: |
-          (cat "$NPM_CONFIG_USERCONFIG" || true) && npm publish --provenance --access public
+          (cat "$NPM_CONFIG_USERCONFIG" || true) && npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  publish-github:
+    if: github.event_name == 'workflow_dispatch'
+    runs-on:
+      - large-amd-on-demand
+    needs:
+      - build
+      - build-linux-glibc-arm
+      - build-linux-musl-x64
+    permissions:
+      contents: read
+      id-token: write
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24.x
+          check-latest: true
+          registry-url: "https://npm.pkg.github.com"
+          scope: "@swimlane"
+      - name: download built libraries
+        id: download
+        uses: actions/download-artifact@v4
+        with:
+          path: prebuilds
+      - name: copy libs
+        run: |
+          set -x
+          mkdir -p prebuilds/linux-arm64
+          mkdir -p prebuilds/linux-x64
+          mkdir -p prebuilds/darwin-arm64
+          mkdir -p prebuilds/darwin-x64
+          find ${{ steps.download.outputs.download-path }}
+          mv ${{ steps.download.outputs.download-path}}/prebuild-Linux-X64/linux-x64/* ./prebuilds/linux-x64/
+          mv ${{ steps.download.outputs.download-path}}/prebuild-linux-arm64/linux-arm64/* ./prebuilds/linux-arm64/
+          mv ${{ steps.download.outputs.download-path}}/prebuild-linux-amd64/linux-x64/* ./prebuilds/linux-x64/
+          mv ${{ steps.download.outputs.download-path}}/prebuild-macOS-ARM64/darwin-arm64/* ./prebuilds/darwin-arm64/
+          find ./prebuilds
+      - name: npm install
+        run: npm ci --ignore-scripts
+      - name: generate source code
+        run: npm run preinstall
+      - name: publish
+        run: |
+          (cat "$NPM_CONFIG_USERCONFIG" || true) && npm publish --access restricted
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/.github/workflows/release.yml

@@ -0,0 +1,45 @@
+name: Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: write # for checkout and tag
+  actions: write # updating envs
+  pull-requests: write # for comments
+  packages: write # for publish
+  id-token: write
+
+jobs:
+  release-prep:
+    name: Release | Prep
+    runs-on:
+      - ubuntu-latest
+    outputs:
+      release-outputs: ${{ toJSON(steps.release.outputs) }}
+    steps:
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Commit Linter
+        uses: wagoid/commitlint-github-action@v6
+        with:
+          commitDepth: 1
+
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+
+      - uses: googleapis/release-please-action@v4
+        name: release-please
+        id: release
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          release-type: 'node'

package/.github/workflows/tests.yml

@@ -1,3 +1,5 @@
+name: Test
+
 on:
   push:
     branches:
@@ -7,6 +9,9 @@ on:
       - v*.*.*
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
   linux-test:
     name: "test on linux"
@@ -16,8 +21,8 @@ jobs:
       npm_config_clang: 1
       GYP_DEFINES: use_obsolete_asm=true
       DEBIAN_FRONTEND: "noninteractive"
-    runs-on: ubuntu-20.04
-    container: ubuntu:20.04
+    runs-on: ubuntu-24.04
+    container: ubuntu:24.04
     steps:
       - name: prerequisites
         run: |
@@ -28,7 +33,7 @@ jobs:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24.0.0
           check-latest: true
       - name: Test
         run: |
@@ -56,14 +61,14 @@ jobs:
       CXX: clang++
       npm_config_clang: 1
       GYP_DEFINES: use_obsolete_asm=true
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24.0.0
           check-latest: true
       - name: Test
         run: |

package/README.md

@@ -1,6 +1,6 @@
 # NodeGit
 
-> Node bindings to the [libgit2](http://libgit2.github.com/) project.
+> Node bindings to the [libgit2](http://libgit2.github.com/) project. 
 
 [![Actions Status](https://github.com/nodegit/nodegit/workflows/Testing/badge.svg)](https://github.com/nodegit/nodegit/actions)
 

package/binding.gyp

@@ -17,38 +17,8 @@
   },
 
   "targets": [{
-    "target_name": "acquireOpenSSL",
-    "type": "none",
-    "conditions": [
-      ["<(is_electron) == 1 and <!(node -p \"process.env.npm_config_openssl_dir ? 0 : 1\")", {
-        "actions": [{
-          "action_name": "acquire",
-          "action": ["node", "utils/acquireOpenSSL.js", "<(macOS_deployment_target)"],
-          "inputs": [""],
-          "outputs": ["vendor/openssl"],
-          "message": "Acquiring OpenSSL binaries and headers"
-        }]
-      }]
-    ]
-  }, {
-    "target_name": "configureLibssh2",
-    "type": "none",
-    "actions": [{
-      "action_name": "configure",
-      "action": ["node", "utils/configureLibssh2.js"],
-      "inputs": [""],
-      "outputs": [""]
-    }],
-    "hard_dependencies": [
-      "acquireOpenSSL"
-    ]
-  }, {
     "target_name": "nodegit",
 
-    "hard_dependencies": [
-      "configureLibssh2"
-    ],
-
     "dependencies": [
       "vendor/libgit2.gyp:libgit2"
     ],
@@ -85,6 +55,7 @@
       "src/attr_options.cc",
       "src/blame.cc",
       "src/blame_hunk.cc",
+      "src/blame_line.cc",
       "src/blame_options.cc",
       "src/blob.cc",
       "src/blob_filter_options.cc",
@@ -103,9 +74,12 @@
       "src/clone.cc",
       "src/clone_options.cc",
       "src/commit.cc",
+      "src/commit_create_options.cc",
       "src/commit_graph.cc",
       "src/commit_graph_writer.cc",
+      "src/commitarray.cc",
       "src/config.cc",
+      "src/config_backend_memory_options.cc",
       "src/config_entry.cc",
       "src/config_entry.cc",
       "src/config_iterator.cc",
@@ -129,6 +103,8 @@
       "src/diff_patchid_options.cc",
       "src/diff_perfdata.cc",
       "src/diff_stats.cc",
+      "src/email.cc",
+      "src/email_create_options.cc",
       "src/error.cc",
       "src/fetch.cc",
       "src/fetch_options.cc",
@@ -224,6 +200,7 @@
       "src/treebuilder.cc",
       "src/worktree.cc",
       "src/worktree_add_options.cc",
+      "src/worktree_add_options.cc",
       "src/worktree_prune_options.cc",
       "src/worktree_prune_options.cc",
       "src/writestream.cc",
@@ -232,7 +209,7 @@
     "include_dirs": [
       "vendor/libv8-convert",
       "vendor/libssh2/include",
-      "<!(node -e \"require('@axosoft/nan')\")"
+      "<!(node -e \"require('nan')\")"
     ],
 
     "cflags": [
@@ -296,7 +273,8 @@
             }]
           ],
           "defines": [
-            "_HAS_EXCEPTIONS=1"
+            "_HAS_EXCEPTIONS=1",
+            "NOMINMAX=1"
           ],
           "msvs_settings": {
             "VCCLCompilerTool": {
@@ -312,9 +290,9 @@
             }
           },
           "libraries": [
-            "winhttp.lib",
             "crypt32.lib",
-            "rpcrt4.lib"
+            "rpcrt4.lib",
+            "secur32.lib"
           ]
         }
       ],
@@ -330,21 +308,28 @@
               "-std=c++<(cxx_version)"
             ],
           }],
-          ["<(is_electron) == 1 and <(electron_openssl_static) == 1", {
+          ["<(is_electron) == 1", {
+            "conditions": [
+              ["<(electron_openssl_static) == 1", {
+                "libraries": [
+                  "<(electron_openssl_root)/lib/libssl.a",
+                  "<(electron_openssl_root)/lib/libcrypto.a"
+                ]
+              }],
+              ["<(electron_openssl_static) != 1", {
+                "library_dirs": [
+                  "<(electron_openssl_root)/lib"
+                ],
+                "libraries": [
+                  "-lcrypto",
+                  "-lssl"
+                ]
+              }]
+            ],
             "include_dirs": [
               "<(electron_openssl_root)/include"
             ],
-            "libraries": [#this order is significant on centos7 apparently...
-              "<(electron_openssl_root)/lib/libssl.a",
-              "<(electron_openssl_root)/lib/libcrypto.a"
-            ]
           }],
-          ["<(is_electron) == 1 and <(electron_openssl_static) != 1", {
-            "libraries": [
-              "-lcrypto",
-              "-lssl"
-            ]
-          }]
         ],
       }],
       [

package/lib/credential.js

@@ -16,6 +16,7 @@ NodeGit.Cred = {
   defaultNew: deprecatedFn("defaultNew"),
   sshKeyFromAgent: deprecatedFn("sshKeyFromAgent"),
   sshKeyNew: deprecatedFn("sshKeyNew"),
+  sshKeyMemoryNew: deprecatedFn("sshKeyMemoryNew"),
   usernameNew: deprecatedFn("usernameNew"),
   userpassPlaintextNew: deprecatedFn("userpassPlaintextNew"),
   TYPE: Object.keys(Credential.TYPE).reduce(

package/lib/enums.js

@@ -69,8 +69,7 @@ NodeGit.Checkout.NOTIFY = {
   ALL: 65535,
 };
 NodeGit.Checkout.STRATEGY = {
-  NONE: 0,
-  SAFE: 1,
+  SAFE: 0,
   FORCE: 2,
   RECREATE_MISSING: 4,
   ALLOW_CONFLICTS: 16,
@@ -91,6 +90,7 @@ NodeGit.Checkout.STRATEGY = {
   DONT_WRITE_INDEX: 8388608,
   DRY_RUN: 16777216,
   CONFLICT_STYLE_ZDIFF3: 33554432,
+  NONE: 1073741824,
   UPDATE_SUBMODULES: 65536,
   UPDATE_SUBMODULES_IF_CHANGED: 131072,
 };
@@ -109,7 +109,8 @@ NodeGit.Config.LEVEL = {
   XDG: 3,
   GLOBAL: 4,
   LOCAL: 5,
-  APP: 6,
+  WORKTREE: 6,
+  APP: 7,
   HIGHEST_LEVEL: -1,
 };
 NodeGit.Config.MAP = {
@@ -237,11 +238,11 @@ NodeGit.Enums.DIRECTION = {
   FETCH: 0,
   PUSH: 1,
 };
-NodeGit.Enums.EMAIL_CREATE_FLAGS = {
-  EMAIL_CREATE_DEFAULT: 0,
-  EMAIL_CREATE_OMIT_NUMBERS: 1,
-  EMAIL_CREATE_ALWAYS_NUMBER: 2,
-  EMAIL_CREATE_NO_RENAMES: 4,
+NodeGit.Email.CREATE_FLAGS = {
+  CREATE_DEFAULT: 0,
+  CREATE_OMIT_NUMBERS: 1,
+  CREATE_ALWAYS_NUMBER: 2,
+  CREATE_NO_RENAMES: 4,
 };
 NodeGit.Error.ERROR = {
   NONE: 0,
@@ -315,12 +316,23 @@ NodeGit.Error.CODE = {
   EAPPLYFAIL: -35,
   EOWNER: -36,
   TIMEOUT: -37,
+  EUNCHANGED: -38,
+  ENOTSUPPORTED: -39,
+  EREADONLY: -40,
 };
 NodeGit.Enums.FEATURE = {
   THREADS: 1,
   HTTPS: 2,
   SSH: 4,
   NSEC: 8,
+  HTTP_PARSER: 16,
+  REGEX: 32,
+  I18N: 64,
+  AUTH_NTLM: 128,
+  AUTH_NEGOTIATE: 256,
+  COMPRESSION: 512,
+  SHA1: 1024,
+  SHA256: 2048,
 };
 NodeGit.Fetch.DEPTH = {
   FULL: 0,
@@ -431,6 +443,9 @@ NodeGit.Libgit2.OPT = {
   GET_SERVER_CONNECT_TIMEOUT: 40,
   SET_SERVER_TIMEOUT: 41,
   GET_SERVER_TIMEOUT: 42,
+  SET_USER_AGENT_PRODUCT: 43,
+  GET_USER_AGENT_PRODUCT: 44,
+  ADD_SSL_X509_CERT: 45,
 };
 NodeGit.Merge.ANALYSIS = {
   NONE: 0,
@@ -559,6 +574,10 @@ NodeGit.Remote.REDIRECT = {
   INITIAL: 2,
   ALL: 4,
 };
+NodeGit.Remote.UPDATE_FLAGS = {
+  UPDATE_FETCHHEAD: 1,
+  UPDATE_REPORT_UNCHANGED: 2,
+};
 NodeGit.Repository.INIT_FLAG = {
   BARE: 1,
   NO_REINIT: 2,
@@ -588,7 +607,8 @@ NodeGit.Repository.ITEM = {
   LOGS: 11,
   MODULES: 12,
   WORKTREES: 13,
-  _LAST: 14,
+  WORKTREE_CONFIG: 14,
+  _LAST: 15,
 };
 NodeGit.Repository.OPEN_FLAG = {
   OPEN_NO_SEARCH: 1,