Skip to content

Commit debba20

Browse files
committed
Update to 1.86, update tooling, add dioxus-cli
1 parent 05707ea commit debba20

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

.github/workflows/docker.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ jobs:
8585
latest: false
8686
- version: nightly
8787
latest: false
88-
- version: "1.85"
88+
- version: "1.86"
8989
latest: true
90-
- version: "1.84"
90+
- version: "1.85"
9191
latest: false
9292
runs-on: ubuntu-latest
9393
steps:
@@ -127,12 +127,12 @@ jobs:
127127
# Cargo-udeps version from https://github.com/est31/cargo-udeps/releases
128128
# All packages use x86_64-unknown-linux-musl and aarch64-unknown-linux-musl
129129
build-args: |
130-
RUSTUP_VERSION=1.27.1
131-
RUSTUP_SHA256_AMD64=6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d
132-
RUSTUP_SHA256_ARM64=1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2
133-
CARGO_BINSTALL_VERSION=1.11.2
134-
CARGO_BINSTALL_SHA256_AMD64=ea9ce8f0b4139aaa7f8cce03fb0e54f206a6a9d0b8e2e586dfae99d4a92c3fa0
135-
CARGO_BINSTALL_SHA256_ARM64=e346df04a676ddfe46f4b900507d7d844a472182dd0c849c582b786be971be6a
130+
RUSTUP_VERSION=1.28.1
131+
RUSTUP_SHA256_AMD64=a3339fb004c3d0bb9862ba0bce001861fe5cbde9c10d16591eb3f39ee6cd3e7f
132+
RUSTUP_SHA256_ARM64=c64b33db2c6b9385817ec0e49a84bcfe018ed6e328fe755c3c809580cc70ce7a
133+
CARGO_BINSTALL_VERSION=1.12.3
134+
CARGO_BINSTALL_SHA256_AMD64=deeee17791719fc544dd1f542d4a482da70ea4ebfddf414d3ca27e5dc12242e3
135+
CARGO_BINSTALL_SHA256_ARM64=7b4061abf34550ad1be68fe9f36dc9347b1edabe6275eee19b1c1c495ccb9c69
136136
SCCACHE_VERSION=0.10.0
137137
SCCACHE_SHA256_AMD64=1fbb35e135660d04a2d5e42b59c7874d39b3deb17de56330b25b713ec59f849b
138138
SCCACHE_SHA256_ARM64=d6a1ce4acd02b937cd61bc675a8be029a60f7bc167594c33d75732bbc0a07400

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ RUN set -eux; \
2828
rm -rf /var/lib/apt/lists/*;
2929

3030
ARG RUSTUP_VERSION
31-
ENV RUSTUP_VERSION ${RUSTUP_VERSION}
31+
ENV RUSTUP_VERSION=${RUSTUP_VERSION}
3232

3333
ARG RUSTUP_SHA256_AMD64
3434
ARG RUSTUP_SHA256_ARM64
3535

3636
ARG RUST_VERSION
37-
ENV RUST_VERSION ${RUST_VERSION:-stable}
37+
ENV RUST_VERSION=${RUST_VERSION:-stable}
3838

3939
ARG RUST_COMPONENTS="rustfmt clippy rust-analysis rls rust-src"
4040

@@ -67,7 +67,7 @@ RUN set -eux; \
6767
rustc --version;
6868

6969
ARG SCCACHE_VERSION
70-
ENV SCCACHE_VERSION ${SCCACHE_VERSION}
70+
ENV SCCACHE_VERSION=${SCCACHE_VERSION}
7171

7272
ARG SCCACHE_SHA256_AMD64
7373
ARG SCCACHE_SHA256_ARM64
@@ -95,7 +95,7 @@ RUN set -eux; \
9595
sccache --version;
9696

9797
ARG CARGO_BINSTALL_VERSION
98-
ENV CARGO_BINSTALL_VERSION ${CARGO_BINSTALL_VERSION}
98+
ENV CARGO_BINSTALL_VERSION=${CARGO_BINSTALL_VERSION}
9999

100100
ARG CARGO_BINSTALL_SHA256_AMD64
101101
ARG CARGO_BINSTALL_SHA256_ARM64
@@ -148,6 +148,7 @@ RUN set -eux; \
148148
mdbook \
149149
wasm-bindgen-cli \
150150
sqlx-cli \
151+
dioxus-cli \
151152
; \
152153
sqlx --version; \
153154
wasm-bindgen --version; \
@@ -165,7 +166,7 @@ RUN set -eux; \
165166
cargo llvm-lines --version;
166167

167168
ARG CARGO_UDEPS_VERSION
168-
ENV CARGO_UDEPS_VERSION ${CARGO_UDEPS_VERSION}
169+
ENV CARGO_UDEPS_VERSION=${CARGO_UDEPS_VERSION}
169170

170171
ARG CARGO_UDEPS_SHA256_AMD64
171172
ARG CARGO_UDEPS_SHA256_ARM64

Dockerfile-node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM "ghcr.io/tweedegolf/rust-dev:${RUST_VERSION}"
33

44
# Install node.js
55
ARG NODE_VERSION
6-
ENV NODE_VERSION ${NODE_VERSION}
6+
ENV NODE_VERSION=${NODE_VERSION}
77
RUN curl -s -L https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \
88
&& echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
99
&& apt-get update \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ to it (and install any optional library dependencies). Currently these versions
77
are supported:
88

99
* Rust stable: `stable` (`ghcr.io/tweedegolf/rust-dev:stable`)
10-
* Rust 1.85: `1.85`, `latest` (`ghcr.io/tweedegolf/rust-dev:1.85`)
11-
* Rust 1.84: `1.84` (`ghcr.io/tweedegolf/rust-dev:1.84`)
10+
* Rust 1.86: `1.86`, `latest` (`ghcr.io/tweedegolf/rust-dev:1.86`)
11+
* Rust 1.85: `1.85` (`ghcr.io/tweedegolf/rust-dev:1.85`)
1212
* Rust beta: `beta` (`ghcr.io/tweedegolf/rust-dev:beta`)
1313
* Rust nightly: `nightly` (`ghcr.io/tweedegolf/rust-dev:nightly`)
1414

0 commit comments

Comments
 (0)