Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/braces-3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
lhchavez authored Jul 9, 2024
2 parents 9e86129 + 3195048 commit e48a992
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
target: x86_64-apple-darwin
- host: macos-latest
target: aarch64-apple-darwin
- host: ubuntu-latest
- host: ubuntu-20.04
target: x86_64-unknown-linux-gnu
name: Build and test on ${{ matrix.settings.target }}
runs-on: ${{ matrix.settings.host }}
Expand Down Expand Up @@ -64,6 +64,8 @@ jobs:
npm run build &&
strip -x *.node
shell: bash
- name: Dump GLIBC symbols
run: objdump -T *.node | grep GLIBC | sed 's/.*GLIBC_\([.0-9]*\).*/\1/g' | sort -Vu
- name: Test bindings
run: npm run test
- name: Upload artifact
Expand All @@ -75,7 +77,7 @@ jobs:

publish:
name: Publish
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
if: github.ref == 'refs/heads/main'
needs:
- build-test
Expand All @@ -101,14 +103,10 @@ jobs:
- name: Publish
run: |
npm config set provenance true
if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$";
if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+";
then
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
npm publish --access public
elif git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+";
then
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
npm publish --tag next --access public
else
echo "Not a release, skipping publish"
fi
Expand Down
6 changes: 5 additions & 1 deletion npm/darwin-arm64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@replit/ruspty-darwin-arm64",
"version": "3.0.1",
"version": "3.0.5",
"os": [
"darwin"
],
Expand All @@ -14,5 +14,9 @@
"license": "MIT",
"engines": {
"node": ">= 10"
},
"repository": {
"type": "git",
"url": "git+https://github.com/replit/ruspty.git"
}
}
2 changes: 1 addition & 1 deletion npm/darwin-x64/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@replit/ruspty-darwin-x64",
"version": "3.0.1",
"version": "3.0.5",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion npm/linux-x64-gnu/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@replit/ruspty-linux-x64-gnu",
"version": "3.0.1",
"version": "3.0.5",
"os": [
"linux"
],
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@replit/ruspty",
"version": "3.0.1",
"version": "3.0.5",
"main": "dist/wrapper.js",
"types": "dist/wrapper.d.ts",
"author": "Szymon Kaliski <[email protected]>",
Expand Down
4 changes: 4 additions & 0 deletions wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,8 @@ export class Pty {
resize(size: Size) {
this.#pty.resize(size);
}

get pid() {
return this.#pty.pid;
}
}

0 comments on commit e48a992

Please sign in to comment.