Skip to content

Commit 87b642b

Browse files
authored
Merge pull request #103 from f2calv/copilot/improve-option-string-display
Fix Option values displaying as `Some("...")` in log output
2 parents f12f847 + 0caa46e commit 87b642b

9 files changed

Lines changed: 101 additions & 174 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust/.devcontainer/base.Dockerfile
1+
# See here for image contents: https://github.com/devcontainers/images/tree/main/src/rust
22

3-
# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye
4-
ARG VARIANT="buster"
5-
FROM mcr.microsoft.com/vscode/devcontainers/rust:0-${VARIANT}
3+
ARG VARIANT="bookworm"
4+
FROM mcr.microsoft.com/devcontainers/rust:1-${VARIANT}
65

76
# [Optional] Uncomment this section to install additional packages.
87
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/rust
2+
// https://github.com/devcontainers/images/tree/main/src/rust
33
{
44
"name": "Rust",
55
"build": {
66
"dockerfile": "Dockerfile",
77
"args": {
8-
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
9-
// Use bullseye when on local on arm64/Apple Silicon.
10-
"VARIANT": "bullseye"
8+
// Use the VARIANT arg to pick a Debian OS version: bookworm, bullseye
9+
"VARIANT": "bookworm"
1110
}
1211
},
1312
"runArgs": [
@@ -40,7 +39,7 @@
4039
"files.watcherExclude": {
4140
"**/target/**": true
4241
},
43-
"rust-analyzer.checkOnSave.command": "clippy"
42+
"rust-analyzer.check.command": "clippy"
4443
},
4544
// Add the IDs of extensions you want installed when the container is created.
4645
"extensions": [

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ jobs:
5050
contents: read #note: for private repos setting packages to write, will reset all other permissions to none (weird?)
5151
needs: [versioning, app, image]
5252
with:
53-
registry: ghcr.io/${{ github.repository_owner }}
54-
chart-repository-prefix: charts/
53+
image-registry: ghcr.io
54+
image-repository: ${{ github.repository_owner }}/multi-arch-container-rust
55+
chart-registry: ghcr.io
56+
chart-registry-username: ${{ github.repository_owner }}
57+
chart-repository: ${{ github.repository_owner }}/charts/multi-arch-container-rust
58+
chart-path: charts/multi-arch-container-rust
5559
tag: ${{ needs.versioning.outputs.semVer }}
5660
push-chart: ${{ github.ref_name == github.event.repository.default_branch }}
57-
chart-testing-cli-command: install
61+
secrets: inherit
5862

5963
release:
6064
needs: [versioning, app, image, chart]

0 commit comments

Comments
 (0)