Skip to content

Commit 274b765

Browse files
committed
pin rust patch version for now
1 parent caa7760 commit 274b765

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
ARG GO_TAG=1.24
9-
ARG RUST_TAG=1.87
9+
ARG RUST_TAG=1.88.0
1010

1111
# These layers include Debian apt caches, so layers that extend `apt-base`
1212
# should not be published. Instead, these layers should be used to provide
@@ -45,7 +45,7 @@ RUN url="https://github.com/olix0r/j5j/releases/download/${J5J_VERSION}/j5j-${J5
4545

4646
# just runs build/test recipes. Like `make` but a bit more ergonomic.
4747
FROM apt-base as just
48-
ARG JUST_VERSION=1.40.0 # repo=casey/just
48+
ARG JUST_VERSION=1.41.0 # repo=casey/just
4949
RUN url="https://github.com/casey/just/releases/download/${JUST_VERSION}/just-${JUST_VERSION}-x86_64-unknown-linux-musl.tar.gz" ; \
5050
scurl "$url" | tar zvxf - -C /usr/local/bin just
5151

@@ -173,7 +173,7 @@ RUN url="https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGO_D
173173

174174
# cargo-nextest is a nicer test runner.
175175
FROM apt-base as cargo-nextest
176-
ARG NEXTEST_VERSION=0.9.99 # repo=nextest-rs/nextest,prefix=cargo-nextest-
176+
ARG NEXTEST_VERSION=0.9.100 # repo=nextest-rs/nextest,prefix=cargo-nextest-
177177
RUN url="https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${NEXTEST_VERSION}/cargo-nextest-${NEXTEST_VERSION}-x86_64-unknown-linux-gnu.tar.gz" ; \
178178
scurl "$url" | tar zvxf - -C /usr/local/bin cargo-nextest
179179

update-versions.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,8 @@ func latestGoMinorVersion(ctx context.Context) (string, error) {
117117
return parts[0] + "." + parts[1], nil
118118
}
119119

120-
func latestRustMinorVersion(ctx context.Context) (string, error) {
121-
v, err := latestGitHubTag(ctx, "rust-lang/rust")
122-
if err != nil {
123-
return "", err
124-
}
125-
// Rust tags are like "1.78.0", we want "1.78"
126-
parts := strings.SplitN(v, ".", 3)
127-
if len(parts) < 2 {
128-
return v, nil
129-
}
130-
// return "major.minor"
131-
return parts[0] + "." + parts[1], nil
120+
func latestRustVersion(ctx context.Context) (string, error) {
121+
return latestGitHubTag(ctx, "rust-lang/rust")
132122
}
133123

134124
// parseHints extracts repo and prefix hints from a comment suffix like "# repo=owner/repo,prefix=xyz-"
@@ -191,7 +181,7 @@ func updateARG(ctx context.Context, line string) (newLine string, changed bool,
191181
case name == "GO_TAG":
192182
newVal, err = latestGoMinorVersion(ctx)
193183
case name == "RUST_TAG":
194-
newVal, err = latestRustMinorVersion(ctx)
184+
newVal, err = latestRustVersion(ctx)
195185
case repoHint != "":
196186
newVal, err = latestGitHubTag(ctx, repoHint)
197187
default:

0 commit comments

Comments
 (0)