Skip to content

Commit 130b397

Browse files
authored
Merge branch 'main' into jk/feat/sql-block-credentials
2 parents 83b7ab9 + 614334b commit 130b397

File tree

9 files changed

+22
-30
lines changed

9 files changed

+22
-30
lines changed

.devcontainer/dev-with-python/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
"mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"],
3535
// Use 'postCreateCommand' to run commands after the container is created.
36-
// "postCreateCommand": "npm ci",
36+
// "postCreateCommand": "npm install",
3737
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
3838
"remoteUser": "vscode"
3939
}

.devcontainer/dev/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"]
2121
// Use 'postCreateCommand' to run commands after the container is created.
22-
// "postCreateCommand": "npm ci",
22+
// "postCreateCommand": "npm install",
2323
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
2424
// , "remoteUser": "vscode"
2525
}

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Default owners for everything in the repository
2-
* @saltenasl @jamesbhobbs @Artmann @andyjakubowski
2+
* @saltenasl @jamesbhobbs @Artmann

.github/workflows/ci.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
branches: [main]
88
workflow_dispatch:
99

10-
env:
11-
NODE_VERSION: 22.x
12-
1310
permissions:
1411
actions: read
1512
contents: read
@@ -32,7 +29,7 @@ jobs:
3229
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3330
with:
3431
cache: 'npm'
35-
node-version: ${{ env.NODE_VERSION }}
32+
node-version-file: '.nvmrc'
3633
registry-url: 'https://npm.pkg.github.com'
3734
scope: '@deepnote'
3835

@@ -59,7 +56,7 @@ jobs:
5956
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
6057
with:
6158
cache: 'npm'
62-
node-version: ${{ env.NODE_VERSION }}
59+
node-version-file: '.nvmrc'
6360
registry-url: 'https://npm.pkg.github.com'
6461
scope: '@deepnote'
6562

@@ -78,7 +75,9 @@ jobs:
7875

7976
steps:
8077
- name: Checkout code
81-
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
78+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
79+
with:
80+
fetch-depth: 0
8281

8382
- name: Install qlty
8483
uses: qltysh/qlty-action/install@6bbb1add7432c45a3fd35a824ea69dc5bef27967
@@ -105,7 +104,7 @@ jobs:
105104
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
106105
with:
107106
cache: 'npm'
108-
node-version: ${{ env.NODE_VERSION }}
107+
node-version-file: '.nvmrc'
109108
registry-url: 'https://npm.pkg.github.com'
110109
scope: '@deepnote'
111110

@@ -155,7 +154,7 @@ jobs:
155154
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
156155
with:
157156
cache: 'npm'
158-
node-version: ${{ env.NODE_VERSION }}
157+
node-version-file: '.nvmrc'
159158
registry-url: 'https://npm.pkg.github.com'
160159
scope: '@deepnote'
161160

@@ -179,7 +178,7 @@ jobs:
179178
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
180179
with:
181180
cache: 'npm'
182-
node-version: ${{ env.NODE_VERSION }}
181+
node-version-file: '.nvmrc'
183182
registry-url: 'https://npm.pkg.github.com'
184183
scope: '@deepnote'
185184

@@ -203,7 +202,7 @@ jobs:
203202
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
204203
with:
205204
cache: 'npm'
206-
node-version: ${{ env.NODE_VERSION }}
205+
node-version-file: '.nvmrc'
207206
registry-url: 'https://npm.pkg.github.com'
208207
scope: '@deepnote'
209208

@@ -227,7 +226,7 @@ jobs:
227226
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
228227
with:
229228
cache: 'npm'
230-
node-version: ${{ env.NODE_VERSION }}
229+
node-version-file: '.nvmrc'
231230
registry-url: 'https://npm.pkg.github.com'
232231
scope: '@deepnote'
233232

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- .github/workflows/copilot-setup-steps.yml
1313

1414
env:
15-
NODE_VERSION: 22.15.1
1615
NPM_VERSION: 10.9.2
1716
PYTHON_VERSION: 3.12
1817
DENO_VERSION: '~1.37'
@@ -42,7 +41,7 @@ jobs:
4241
- name: Use Node ${{env.NODE_VERSION}}
4342
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
4443
with:
45-
node-version: ${{env.NODE_VERSION}}
44+
node-version-file: '.nvmrc'
4645
registry-url: 'https://npm.pkg.github.com'
4746
scope: '@deepnote'
4847

.github/workflows/deps.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ on:
66
- cron: '0 9 * * 1'
77
workflow_dispatch:
88

9-
env:
10-
NODE_VERSION: 22.x
11-
129
permissions:
1310
actions: read
1411
contents: read
@@ -30,7 +27,7 @@ jobs:
3027
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3128
with:
3229
cache: 'npm'
33-
node-version: ${{ env.NODE_VERSION }}
30+
node-version-file: '.nvmrc'
3431
registry-url: 'https://npm.pkg.github.com'
3532
scope: '@deepnote'
3633

@@ -62,7 +59,7 @@ jobs:
6259
- name: Setup Node.js
6360
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
6461
with:
65-
node-version: ${{ env.NODE_VERSION }}
62+
node-version-file: '.nvmrc'
6663
cache: 'npm'
6764

6865
- name: Install dependencies

.github/workflows/package.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
branches: [main]
88
workflow_dispatch:
99

10-
env:
11-
NODE_VERSION: 22.x
12-
1310
permissions:
1411
contents: read
1512
packages: read
@@ -31,7 +28,7 @@ jobs:
3128
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3229
with:
3330
cache: 'npm'
34-
node-version: ${{ env.NODE_VERSION }}
31+
node-version-file: '.nvmrc'
3532
registry-url: 'https://npm.pkg.github.com'
3633
scope: '@deepnote'
3734

.husky/post-checkout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
npm ci
1+
npm install

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The `@deepnote/blocks` package is published on GitHub Packages. To install it, y
5858
```
5959
Replace `YOUR_TOKEN_HERE` with your actual token.
6060

61-
After completing these steps, you can install dependencies normally with `npm ci`. The project's `.npmrc` file is already configured to use GitHub Packages for the `@deepnote` scope.
61+
After completing these steps, you can install dependencies normally with `npm install`. The project's `.npmrc` file is already configured to use GitHub Packages for the `@deepnote` scope.
6262

6363
On Apple Silicon, you will have to use system versions of `libsodium` and `libzmq` instead of the bundled ones:
6464

@@ -78,7 +78,7 @@ npm_config_build_from_source=true npm install zeromq@
7878
Install the dependecies:
7979

8080
```shell
81-
npm ci
81+
npm install
8282
# Run this to setup the necessary pre-commit hooks.
8383
npm run setup-precommit-hook
8484
python3 -m venv .venv
@@ -277,7 +277,7 @@ Here's an example of a typical workflow:
277277

278278
1. Sync to main (get your fork's main to match vscode-jupyter's main)
279279
1. Create branch
280-
1. `npm ci`
280+
1. `npm install`
281281
1. `npm run clean`
282282
1. Start VS code Insiders root
283283
1. CTRL+SHIFT+B (run the task `compile`)
@@ -354,7 +354,7 @@ Steps to build the extension on your machine once you've cloned the repo:
354354
```bash
355355
> npm install -g @vscode/vsce
356356
# Perform the next steps in the vscode-jupyter folder.
357-
> npm ci
357+
> npm install
358358
> npm run clean
359359
> npm run package # This step takes around 10 minutes.
360360
```

0 commit comments

Comments
 (0)