Skip to content

Commit a23e0db

Browse files
authored
Merge branch 'main' into fix/spawn-einval-node22
2 parents 3ca0af1 + f683c29 commit a23e0db

47 files changed

Lines changed: 1275 additions & 328 deletions

Some content is hidden

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

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
22
# Licensed under the MIT License. See License.txt in the project root for license information.
3-
ARG VARIANT="16-bullseye"
3+
ARG VARIANT="20-bookworm"
44
FROM mcr.microsoft.com/devcontainers/typescript-node:1-${VARIANT}
55

66
RUN mkdir -p /workspaces && chown node:node /workspaces
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"features": {
3+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
4+
"version": "2.16.1",
5+
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:ce078b7bf7d9ef3bcb9813b32103795d8d72172446890b64772cbe1dec6baafd",
6+
"integrity": "sha256:ce078b7bf7d9ef3bcb9813b32103795d8d72172446890b64772cbe1dec6baafd"
7+
}
8+
}
9+
}

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"build": {
88
"dockerfile": "Dockerfile",
99
"args": {
10-
"VARIANT": "18-bookworm"
10+
"VARIANT": "20-bookworm"
1111
}
1212
},
1313
"mounts": [
@@ -27,7 +27,8 @@
2727
"vscode": {
2828
"extensions": [
2929
"dbaeumer.vscode-eslint",
30-
"GitHub.vscode-pull-request-github"
30+
"GitHub.vscode-pull-request-github",
31+
"hbenl.vscode-mocha-test-adapter"
3132
]
3233
},
3334
"codespaces": {

.github/workflows/dev-containers.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
cli:
1717
name: CLI
1818
runs-on: ubuntu-latest
19+
timeout-minutes: 10
1920
steps:
2021
- uses: actions/checkout@v6
2122
- uses: actions/setup-node@v5
@@ -44,6 +45,7 @@ jobs:
4445
tests-matrix:
4546
name: Tests Matrix
4647
runs-on: ubuntu-latest
48+
timeout-minutes: 30
4749
strategy:
4850
fail-fast: false
4951
matrix:
@@ -111,6 +113,7 @@ jobs:
111113
# TODO: This should be expanded to run on different platforms
112114
# Most notably to test platform-specific credential helper behavior
113115
runs-on: ubuntu-latest
116+
timeout-minutes: 10
114117
steps:
115118
- name: Checkout
116119
uses: actions/checkout@v6
@@ -145,6 +148,7 @@ jobs:
145148
matrix:
146149
os: [ubuntu-latest, macos-latest]
147150
runs-on: ${{ matrix.os }}
151+
timeout-minutes: 10
148152
steps:
149153
- uses: actions/checkout@v6
150154
- name: Run install.sh tests

.github/workflows/publish-dev-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "TGZ=devcontainers-cli-${VERSION}.tgz" | tee -a $GITHUB_ENV
3838
echo "TGZ_UPLOAD=devcontainers-cli-${VERSION}-${GITHUB_SHA:0:8}.tgz" | tee -a $GITHUB_ENV
3939
- name: Download TGZ
40-
uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
40+
uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
4141
with:
4242
workflow: dev-containers.yml
4343
workflow_conclusion: success

.github/workflows/test-docker-v20.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
test-docker-v20:
1414
name: Docker v20.10 Compatibility
1515
runs-on: ubuntu-22.04
16+
timeout-minutes: 20
1617

1718
steps:
1819
- uses: actions/checkout@v6

.github/workflows/test-docker-v29.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
test-docker-v29:
1414
name: Docker v29.0.0 Compatibility
1515
runs-on: ubuntu-latest
16+
timeout-minutes: 20
1617

1718
steps:
1819
- uses: actions/checkout@v6

.github/workflows/test-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ permissions:
1818
jobs:
1919
tests-matrix:
2020
name: Tests Matrix (Windows)
21-
runs-on: windows-latest
21+
runs-on: windows-2022
22+
timeout-minutes: 15
2223
strategy:
2324
fail-fast: false
2425
matrix:

.mocharc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
timeout: 360000 # 6 minutes global safety net; individual suites override via this.timeout()

.vscode/extensions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"recommendations": [
33
"dbaeumer.vscode-eslint",
4+
"hbenl.vscode-mocha-test-adapter"
45
]
56
}

0 commit comments

Comments
 (0)