Skip to content

Commit

Permalink
chore: upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Brooooooklyn committed Aug 16, 2023
1 parent 840edb3 commit 602b7ec
Show file tree
Hide file tree
Showing 11 changed files with 1,191 additions and 1,089 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ env:
DEBUG: napi:*
APP_NAME: simple-git
MACOSX_DEPLOYMENT_TARGET: '10.13'
permissions:
contents: write
id-token: write
'on':
push:
branches:
Expand Down Expand Up @@ -109,7 +112,6 @@ jobs:
if: ${{ !matrix.settings.docker }}
with:
node-version: 18
check-latest: true
cache: yarn
- name: Install
uses: dtolnay/rust-toolchain@stable
Expand All @@ -133,7 +135,7 @@ jobs:
- uses: goto-bus-stop/setup-zig@v2
if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
with:
version: 0.10.1
version: 0.11.0
- name: Install dependencies
run: yarn install --mode=skip-build --immutable
- name: Build in docker
Expand Down Expand Up @@ -179,7 +181,6 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: yarn
- name: Install dependencies
run: yarn install --mode=skip-build --immutable
Expand Down Expand Up @@ -239,7 +240,6 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 18
check-latest: true
cache: yarn
- name: Install dependencies
run: yarn install --mode=skip-build --immutable
Expand All @@ -254,6 +254,7 @@ jobs:
shell: bash
- name: Publish
run: |
npm config set provenance true
if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$";
then
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
Expand Down
823 changes: 0 additions & 823 deletions .yarn/releases/yarn-3.3.1.cjs

This file was deleted.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.3.1.cjs
yarnPath: .yarn/releases/yarn-3.6.1.cjs
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.0.0"
crate-type = ["cdylib"]

[dependencies]
git2 = { version = "0.16", features = ["vendored-libgit2", "vendored-openssl"] }
git2 = { version = "0.17", features = ["vendored-libgit2", "vendored-openssl"] }
once_cell = "1"

[dependencies.napi]
Expand All @@ -19,7 +19,7 @@ features = ["napi3"]
version = "2"

[target.'cfg(all(target_os = "linux", target_env = "gnu", any(target_arch = "x86_64", target_arch = "aarch64")))'.dependencies]
dirs = "4"
dirs = "5"

[build-dependencies]
napi-build = "2"
Expand Down
8 changes: 7 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/* tslint:disable */
/* eslint-disable */
/* prettier-ignore */

/* auto-generated by NAPI-RS */

const { existsSync, readFileSync } = require('fs')
const { join } = require('path')

Expand All @@ -11,7 +17,7 @@ function isMusl() {
// For Node 10
if (!process.report || typeof process.report.getReport !== 'function') {
try {
const lddPath = require('child_process').execSync('which ldd').toString().trim();
const lddPath = require('child_process').execSync('which ldd').toString().trim()
return readFileSync(lddPath, 'utf8').includes('musl')
} catch (e) {
return true
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
],
"license": "MIT",
"devDependencies": {
"@napi-rs/cli": "^2.14.7",
"@types/node": "^18.13.0",
"ava": "^5.2.0",
"@napi-rs/cli": "^2.16.3",
"@types/node": "^20.5.0",
"ava": "^5.3.1",
"pretty-ms": "^8.0.0"
},
"engines": {
Expand All @@ -44,5 +44,5 @@
"test": "ava",
"version": "napi version"
},
"packageManager": "yarn@3.3.1"
"packageManager": "yarn@3.6.1"
}
2 changes: 1 addition & 1 deletion src/deltas.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use napi::bindgen_prelude::{Generator, SharedReference, ToNapiValue};
use napi::bindgen_prelude::*;
use napi_derive::napi;

#[napi(iterator)]
Expand Down
5 changes: 1 addition & 4 deletions src/remote.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use std::mem;

use napi::{
bindgen_prelude::{Result, SharedReference, ToNapiValue},
Env, Error, JsFunction, Status,
};
use napi::{bindgen_prelude::*, Env, Error, JsFunction, Status};
use napi_derive::napi;

use crate::error::IntoNapiError;
Expand Down
7 changes: 1 addition & 6 deletions src/repo.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
use std::borrow::Borrow;
use std::path::{Path, PathBuf};

use napi::{
bindgen_prelude::{
AbortSignal, AsyncTask, Env, Error, Reference, Result, Status, Task, ToNapiValue,
},
JsString,
};
use napi::{bindgen_prelude::*, JsString};
use napi_derive::napi;
use once_cell::sync::Lazy;

Expand Down
Loading

0 comments on commit 602b7ec

Please sign in to comment.