Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
minio:
image: quay.io/minio/minio:RELEASE.2023-04-13T03-08-07Z
image: quay.io/minio/minio:RELEASE.2025-05-24T17-08-30Z
command: minio server /data
ports:
- 9000:9000
Expand Down
11 changes: 8 additions & 3 deletions local/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,25 @@
# regularly takes 2 minutes to download 20MB of binary). The only other way
# they distribute the CLI is from Docker, so we load their image as a stage and
# then copy the binary from it later in the build.
FROM quay.io/minio/mc:RELEASE.2023-04-12T02-21-51Z AS mc
FROM quay.io/minio/mc:RELEASE.2025-04-16T18-13-26Z AS mc

FROM ubuntu:22.04
FROM ubuntu:24.04

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
awscli \
build-essential \
curl \
git \
gnupg \
jq \
python3 \
unzip \
socat

# Install awscli
RUN curl --fail "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install

# Install rustup while removing the pre-installed stable toolchain.
RUN curl https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init >/tmp/rustup-init && \
chmod +x /tmp/rustup-init && \
Expand Down
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Start a dummy local release process, without making changes to any production
# system. This requires docker and docker-compose to be installed.

Expand Down
7 changes: 6 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,12 @@ impl Context {

// If the previously released version is the same rev, then there's
// nothing for us to do, nothing has changed.
if !self.config.bypass_startup_checks && previous_version.contains(&rev[..7]) {
// For nightly, we want to release every night, even if it's the same as the previous one,
// to make it easier for people and tools to use.
if !self.config.bypass_startup_checks
&& self.config.channel != Channel::Nightly
&& previous_version.contains(&rev[..7])
{
println!("found rev in previous version, skipping");
println!("set PROMOTE_RELEASE_BYPASS_STARTUP_CHECKS=1 to bypass the check");
return Ok(());
Expand Down
2 changes: 1 addition & 1 deletion src/smoke_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl SmokeTester {
}

fn server_handler(req: Request<Body>, paths: Arc<Vec<PathBuf>>) -> Result<Response<Body>, Error> {
let file_name = match req.uri().path().split('/').last() {
let file_name = match req.uri().path().split('/').next_back() {
Some(file_name) => file_name,
None => return not_found(),
};
Expand Down