Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/dev-with-python/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

"mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "npm ci",
// "postCreateCommand": "npm install",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
2 changes: 1 addition & 1 deletion .devcontainer/dev/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"mounts": ["source=${localWorkspaceFolder},target=/workspaces/local,type=bind,consistency=cached"]
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "npm ci",
// "postCreateCommand": "npm install",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
// , "remoteUser": "vscode"
}
4 changes: 2 additions & 2 deletions .github/actions/build-vsix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ outputs:
runs:
using: 'composite'
steps:
# This is faster than running `npm ci`, we do not want to build zmq, as its already built by us.
- run: npm ci --ignore-scripts --prefer-offline --no-audit
# This is faster than running `npm install`, we do not want to build zmq, as its already built by us.
- run: npm install --ignore-scripts --prefer-offline --no-audit
shell: bash

# Run again, as the download of zmq binaries could have failed with 403 errors
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/npm-ci/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: 'Install dependencies (npm ci)'
name: 'Install dependencies (npm install)'
description: 'npm install (with GITHUB_TOKEN to run postinstall step)'

runs:
using: 'composite'
steps:
- run: npm ci --foreground-scripts --prefer-offline
- run: npm install --foreground-scripts --prefer-offline
env:
npm_config_build_from_source: true
shell: bash
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
branches: [main]
workflow_dispatch:

env:
NODE_VERSION: 22.x

permissions:
actions: read
contents: read
Expand All @@ -32,7 +29,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

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

Expand Down Expand Up @@ -105,7 +102,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down Expand Up @@ -155,7 +152,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -179,7 +176,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -203,7 +200,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -227,7 +224,7 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- .github/workflows/copilot-setup-steps.yml

env:
NODE_VERSION: 22.15.1
NPM_VERSION: 10.9.2
PYTHON_VERSION: 3.12
DENO_VERSION: '~1.37'
Expand Down Expand Up @@ -42,7 +41,7 @@ jobs:
- name: Use Node ${{env.NODE_VERSION}}
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
node-version: ${{env.NODE_VERSION}}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

Expand All @@ -58,10 +57,10 @@ jobs:
path: ./out
key: ${{runner.os}}-${{env.CACHE_OUT_DIRECTORY}}-${{hashFiles('src/**')}}

# This is faster than running `npm ci`, we do not want to build zmq, etc.
# This is faster than running `npm install`, we do not want to build zmq, etc.
# Let that happen in other jobs, this job needs to be fast
- name: npm ci
run: npm ci --ignore-scripts --prefer-offline --no-audit
- name: npm install
run: npm install --ignore-scripts --prefer-offline --no-audit
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
- cron: '0 9 * * 1'
workflow_dispatch:

env:
NODE_VERSION: 22.x

permissions:
actions: read
contents: read
Expand All @@ -30,12 +27,12 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

- name: Install dependencies
run: npm ci --prefer-offline --no-audit
run: npm install --prefer-offline --no-audit
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -62,11 +59,11 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
cache: 'npm'

- name: Install dependencies
run: npm ci --prefer-offline --no-audit
run: npm install --prefer-offline --no-audit

- name: Run postinstall
run: npm run postinstall
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
branches: [main]
workflow_dispatch:

env:
NODE_VERSION: 22.x

permissions:
contents: read
packages: read
Expand All @@ -31,12 +28,12 @@ jobs:
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
with:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@deepnote'

- name: Install dependencies
run: npm ci --prefer-offline --no-audit
run: npm install --prefer-offline --no-audit
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .husky/post-checkout
Original file line number Diff line number Diff line change
@@ -1 +1 @@
npm ci
npm install
4 changes: 2 additions & 2 deletions build/azure-pipeline.pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ extends:
addToPath: true
architecture: 'x64'

- script: npm ci --foreground-scripts
displayName: npm ci
- script: npm install --foreground-scripts
displayName: npm install
env:
npm_config_build_from_source: true
VSC_VSCE_TARGET: $(vsceTarget)
Expand Down
4 changes: 2 additions & 2 deletions build/azure-pipeline.stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ extends:
addToPath: true
architecture: 'x64'

- script: npm ci --foreground-scripts
displayName: npm ci
- script: npm install --foreground-scripts
displayName: npm install
env:
npm_config_build_from_source: true
VSC_VSCE_TARGET: $(vsceTarget)
Expand Down