Skip to content

Commit e718831

Browse files
committed
Merge branch 'main' into improve-get-info-error
2 parents 6b4d4b9 + 60fb009 commit e718831

File tree

504 files changed

+128756
-14135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

504 files changed

+128756
-14135
lines changed

.changeset/slimy-bears-sell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'e2b': patch
3+
---
4+
5+
Fix request timeout for getInfo and write fs methods

.github/workflows/cli_tests.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,23 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26+
- name: Parse .tool-versions
27+
uses: wistia/[email protected]
28+
with:
29+
filename: '.tool-versions'
30+
uppercase: 'true'
31+
prefix: 'tool_version_'
32+
2633
- name: Install pnpm
2734
uses: pnpm/action-setup@v4
2835
id: pnpm-install
2936
with:
30-
version: 9.15.5
37+
version: '${{ env.TOOL_VERSION_PNPM }}'
3138

3239
- name: Setup Node
3340
uses: actions/setup-node@v3
3441
with:
35-
node-version: '20.x'
42+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
3643
registry-url: 'https://registry.npmjs.org'
3744
cache: pnpm
3845
cache-dependency-path: pnpm-lock.yaml
@@ -51,4 +58,4 @@ jobs:
5158
- name: Run tests
5259
run: pnpm test
5360
env:
54-
E2B_API_KEY: ${{ secrets.E2B_API_KEY }}
61+
E2B_API_KEY: ${{ secrets.E2B_API_KEY }}

.github/workflows/generated_files.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,23 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14+
- name: Parse .tool-versions
15+
uses: wistia/[email protected]
16+
with:
17+
filename: '.tool-versions'
18+
uppercase: 'true'
19+
prefix: 'tool_version_'
20+
1421
- name: Install pnpm
1522
uses: pnpm/action-setup@v4
1623
id: pnpm-install
1724
with:
18-
version: 9.15.5
25+
version: '${{ env.TOOL_VERSION_PNPM }}'
1926

2027
- name: Setup Node
2128
uses: actions/setup-node@v4
2229
with:
23-
node-version: '20.x'
30+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
2431
registry-url: 'https://registry.npmjs.org'
2532
cache: pnpm
2633
cache-dependency-path: pnpm-lock.yaml

.github/workflows/js_sdk_tests.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,23 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26+
- name: Parse .tool-versions
27+
uses: wistia/[email protected]
28+
with:
29+
filename: '.tool-versions'
30+
uppercase: 'true'
31+
prefix: 'tool_version_'
32+
2633
- name: Install pnpm
2734
uses: pnpm/action-setup@v4
2835
id: pnpm-install
2936
with:
30-
version: 9.15.5
37+
version: '${{ env.TOOL_VERSION_PNPM }}'
3138

3239
- name: Setup Node
3340
uses: actions/setup-node@v3
3441
with:
35-
node-version: '20.x'
42+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
3643
registry-url: 'https://registry.npmjs.org'
3744
cache: pnpm
3845
cache-dependency-path: pnpm-lock.yaml
@@ -45,7 +52,6 @@ jobs:
4552
- name: Install dependencies
4653
run: |
4754
pnpm install --frozen-lockfile
48-
npx playwright install --with-deps
4955
5056
- name: Test build
5157
run: pnpm build
@@ -66,7 +72,7 @@ jobs:
6672
- name: Install Deno
6773
uses: denoland/setup-deno@v1
6874
with:
69-
deno-version: v1.x
75+
deno-version: v${{ env.TOOL_VERSION_DENO }}
7076

7177
- name: Run Deno tests
7278
run: pnpm test:deno

.github/workflows/lint.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,21 @@ jobs:
1212
- name: Checkout Repo
1313
uses: actions/checkout@v4
1414

15+
- name: Parse .tool-versions
16+
uses: wistia/[email protected]
17+
with:
18+
filename: '.tool-versions'
19+
uppercase: 'true'
20+
prefix: 'tool_version_'
21+
1522
- uses: pnpm/action-setup@v4
1623
with:
17-
version: 9.15.5
24+
version: '${{ env.TOOL_VERSION_PNPM }}'
1825

19-
- name: Setup Node.js 20
26+
- name: Setup Node.js
2027
uses: actions/setup-node@v4
2128
with:
22-
node-version: '20.x'
29+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
2330
cache: pnpm
2431

2532
- name: Configure pnpm
@@ -33,12 +40,12 @@ jobs:
3340
- name: Set up Python
3441
uses: actions/setup-python@v4
3542
with:
36-
python-version: '3.9'
43+
python-version: '${{ env.TOOL_VERSION_PYTHON }}'
3744

3845
- name: Install and configure Poetry
3946
uses: snok/install-poetry@v1
4047
with:
41-
version: 1.8.3
48+
version: '${{ env.TOOL_VERSION_POETRY }}'
4249
virtualenvs-create: true
4350
virtualenvs-in-project: true
4451
installer-parallel: true

.github/workflows/publish_packages.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ on:
55
secrets:
66
E2B_API_KEY:
77
required: true
8-
NPM_TOKEN:
9-
required: true
108
PYPI_TOKEN:
119
required: true
1210

1311
permissions:
1412
contents: write
13+
id-token: write
1514

1615
jobs:
1716
test:
@@ -29,34 +28,47 @@ jobs:
2928
with:
3029
token: ${{ steps.app-token.outputs.token }}
3130

31+
- name: Parse .tool-versions
32+
uses: wistia/[email protected]
33+
with:
34+
filename: '.tool-versions'
35+
uppercase: 'true'
36+
prefix: 'tool_version_'
37+
3238
- name: Set up Python
3339
uses: actions/setup-python@v4
3440
with:
35-
python-version: '3.9'
41+
python-version: '${{ env.TOOL_VERSION_PYTHON }}'
3642

3743
- name: Install and configure Poetry
3844
uses: snok/install-poetry@v1
3945
with:
40-
version: 1.8.3
46+
version: '${{ env.TOOL_VERSION_POETRY }}'
4147
virtualenvs-create: true
4248
virtualenvs-in-project: true
4349
installer-parallel: true
4450

4551
- uses: pnpm/action-setup@v4
4652
with:
47-
version: 9.15.5
53+
version: '${{ env.TOOL_VERSION_PNPM }}'
4854

49-
- name: Setup Node.js 20
50-
uses: actions/setup-node@v3
55+
- name: Setup Node.js
56+
uses: actions/setup-node@v6
5157
with:
52-
node-version: '20.x'
58+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
59+
registry-url: 'https://registry.npmjs.org'
5360
cache: pnpm
5461

5562
- name: Configure pnpm
5663
run: |
5764
pnpm config set auto-install-peers true
5865
pnpm config set exclude-links-from-lockfile true
5966
67+
- name: Update npm
68+
run: |
69+
npm install -g npm@^11.6
70+
npm --version
71+
6072
- name: Install dependencies
6173
run: pnpm install --frozen-lockfile
6274

@@ -72,7 +84,7 @@ jobs:
7284
createGithubReleases: true
7385
env:
7486
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
87+
NPM_TOKEN: "" # See https://github.com/changesets/changesets/issues/1152#issuecomment-3190884868
7688
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
7789

7890
- name: Generate SDK reference

.github/workflows/python_sdk_tests.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,22 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@v4
2525

26+
- name: Parse .tool-versions
27+
uses: wistia/[email protected]
28+
with:
29+
filename: '.tool-versions'
30+
uppercase: 'true'
31+
prefix: 'tool_version_'
32+
2633
- name: Set up Python
2734
uses: actions/setup-python@v4
2835
with:
29-
python-version: '3.9'
36+
python-version: '${{ env.TOOL_VERSION_PYTHON }}'
3037

3138
- name: Install and configure Poetry
3239
uses: snok/install-poetry@v1
3340
with:
34-
version: 1.8.3
41+
version: '${{ env.TOOL_VERSION_POETRY }}'
3542
virtualenvs-create: true
3643
virtualenvs-in-project: true
3744
installer-parallel: true

.github/workflows/release.yml

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: Release
22

33
on:
4-
push:
5-
branches:
6-
- main
4+
workflow_dispatch:
75

86
concurrency: ${{ github.workflow }}-${{ github.ref }}
97

108
permissions:
9+
id-token: write
1110
contents: write
1211

1312
jobs:
@@ -20,17 +19,24 @@ jobs:
2019
- name: Checkout Repo
2120
uses: actions/checkout@v3
2221

22+
- name: Parse .tool-versions
23+
uses: wistia/[email protected]
24+
with:
25+
filename: '.tool-versions'
26+
uppercase: 'true'
27+
prefix: 'tool_version_'
28+
2329
- name: Install pnpm
2430
uses: pnpm/action-setup@v4
2531
id: pnpm-install
2632
with:
27-
version: 9.15.5
33+
version: '${{ env.TOOL_VERSION_PNPM }}'
2834

2935
- name: Setup Node
30-
uses: actions/setup-node@v3
36+
uses: actions/setup-node@v6
3137
with:
32-
node-version: "20.x"
33-
registry-url: "https://registry.npmjs.org"
38+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
39+
registry-url: 'https://registry.npmjs.org'
3440
cache: pnpm
3541
cache-dependency-path: pnpm-lock.yaml
3642

@@ -61,17 +67,24 @@ jobs:
6167
- name: Checkout Repo
6268
uses: actions/checkout@v3
6369

70+
- name: Parse .tool-versions
71+
uses: wistia/[email protected]
72+
with:
73+
filename: '.tool-versions'
74+
uppercase: 'true'
75+
prefix: 'tool_version_'
76+
6477
- name: Install pnpm
6578
uses: pnpm/action-setup@v4
6679
id: pnpm-install
6780
with:
68-
version: 9.15.5
81+
version: '${{ env.TOOL_VERSION_PNPM }}'
6982

7083
- name: Setup Node
71-
uses: actions/setup-node@v3
84+
uses: actions/setup-node@v6
7285
with:
73-
node-version: "20.x"
74-
registry-url: "https://registry.npmjs.org"
86+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
87+
registry-url: 'https://registry.npmjs.org'
7588
cache: pnpm
7689
cache-dependency-path: pnpm-lock.yaml
7790

.github/workflows/release_candidates.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Release Candidates
22

33
on:
44
pull_request:
5+
types:
6+
- labeled
7+
- opened
8+
- reopened
9+
- synchronize
510

611
permissions:
712
contents: write
@@ -17,16 +22,23 @@ jobs:
1722
with:
1823
ref: ${{ github.head_ref }}
1924

25+
- name: Parse .tool-versions
26+
uses: wistia/[email protected]
27+
with:
28+
filename: '.tool-versions'
29+
uppercase: 'true'
30+
prefix: 'tool_version_'
31+
2032
- uses: pnpm/action-setup@v4
2133
if: ${{ contains( github.event.pull_request.labels.*.name, 'js-rc') || contains( github.event.pull_request.labels.*.name, 'cli-rc') }}
2234
with:
23-
version: 9.15.5
35+
version: '${{ env.TOOL_VERSION_PNPM }}'
2436

25-
- name: Setup Node.js 20
37+
- name: Setup Node.js
2638
uses: actions/setup-node@v4
2739
if: ${{ contains( github.event.pull_request.labels.*.name, 'js-rc') || contains( github.event.pull_request.labels.*.name, 'cli-rc') || contains( github.event.pull_request.labels.*.name, 'python-rc') }}
2840
with:
29-
node-version: '20.x'
41+
node-version: '${{ env.TOOL_VERSION_NODEJS }}'
3042
registry-url: https://registry.npmjs.org
3143
cache: pnpm
3244

@@ -40,13 +52,13 @@ jobs:
4052
uses: actions/setup-python@v4
4153
if: ${{ contains( github.event.pull_request.labels.*.name, 'python-rc') }}
4254
with:
43-
python-version: '3.9'
55+
python-version: '${{ env.TOOL_VERSION_PYTHON }}'
4456

4557
- name: Install and configure Poetry
4658
uses: snok/install-poetry@v1
4759
if: ${{ contains( github.event.pull_request.labels.*.name, 'python-rc') }}
4860
with:
49-
version: 1.8.3
61+
version: '${{ env.TOOL_VERSION_POETRY }}'
5062
virtualenvs-create: true
5163
virtualenvs-in-project: true
5264
installer-parallel: true
@@ -79,7 +91,6 @@ jobs:
7991
working-directory: packages/js-sdk
8092
if: ${{ contains( github.event.pull_request.labels.*.name, 'js-rc') }}
8193
run: |
82-
npx playwright install --with-deps
8394
pnpm run test
8495
env:
8596
E2B_API_KEY: ${{ secrets.E2B_API_KEY }}

.tool-versions

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
deno 1.46.3
2+
nodejs 20.19.5
3+
pnpm 9.15.5
4+
python 3.9
5+
poetry 1.8.3

0 commit comments

Comments
 (0)