Skip to content

Commit 4869bfe

Browse files
committed
Merge branch 'bob/fix-worker-clone' into estringana/add-routes-collection
2 parents 833d44b + ddd9633 commit 4869bfe

File tree

77 files changed

+4928
-1752
lines changed

Some content is hidden

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

77 files changed

+4928
-1752
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/rust
3+
{
4+
"name": "Rust (Alpine)",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/base:alpine", // more images at // more images at https://hub.docker.com/r/microsoft/devcontainers-base
7+
8+
// Allow access to host machine
9+
"runArgs": ["--network=host"],
10+
11+
// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
12+
"mounts": [
13+
{
14+
"source": "devcontainer-cargo-cache-alpine-${devcontainerId}",
15+
"target": "/usr/local/cargo",
16+
"type": "volume"
17+
}
18+
],
19+
20+
"onCreateCommand": "sudo apk add --no-cache build-base rust cargo cargo-zsh-completion rust-src rustfmt cbindgen patchelf cmake",
21+
22+
"customizations": {
23+
"vscode": {
24+
"extensions": [
25+
"rust-lang.rust-analyzer",
26+
"vadimcn.vscode-lldb",
27+
"tamasfe.even-better-toml"
28+
]
29+
}
30+
}
31+
}

.devcontainer/devcontainer.json renamed to .devcontainer/ubuntu/devcontainer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
22
// README at: https://github.com/devcontainers/templates/tree/main/src/rust
33
{
4-
"name": "Rust",
4+
"name": "Rust (Ubuntu)",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
6+
"image": "mcr.microsoft.com/devcontainers/base:ubuntu", // more images at https://hub.docker.com/r/microsoft/devcontainers-base
77

88
// Allow access to host machine
99
"runArgs": ["--network=host"],
@@ -25,14 +25,15 @@
2525
},
2626

2727
// Use 'postCreateCommand' to run commands after the container is created.
28-
"postCreateCommand": "cargo install cbindgen",
28+
"postCreateCommand": "sudo apt-get update && sudo apt-get install -y patchelf && cargo install cbindgen",
2929

3030
// Configure tool-specific properties.
3131
"customizations": {
3232
"vscode": {
3333
"extensions": [
3434
"rust-lang.rust-analyzer",
35-
"vadimcn.vscode-lldb"
35+
"vadimcn.vscode-lldb",
36+
"tamasfe.even-better-toml"
3637
]
3738
}
3839
}

.github/workflows/all-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
- uses: wechuli/allcheckspassed@f4669eca31dbad8fea1a0eb91c419d02c5b42200 # 1.1.1
1515
with:
1616
delay: '3'
17-
retries: '30'
17+
retries: '45'
1818
polling_interval: '1'
1919
checks_exclude: 'devflow/merge'

0 commit comments

Comments
 (0)