diff --git a/Cargo.lock b/Cargo.lock index 334852b..65c4056 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -369,16 +369,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -1353,12 +1352,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" - [[package]] name = "ppv-lite86" version = "0.2.17" diff --git a/docker-compose.yml b/docker-compose.yml index 5b99bbc..b88570c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/local/Dockerfile b/local/Dockerfile index 0087840..c207d5d 100644 --- a/local/Dockerfile +++ b/local/Dockerfile @@ -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 && \ diff --git a/run.sh b/run.sh index 60be624..40046cf 100755 --- a/run.sh +++ b/run.sh @@ -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. diff --git a/src/main.rs b/src/main.rs index 9bafd1c..c6aee19 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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(()); diff --git a/src/smoke_test.rs b/src/smoke_test.rs index 6af656c..79e3159 100644 --- a/src/smoke_test.rs +++ b/src/smoke_test.rs @@ -115,7 +115,7 @@ impl SmokeTester { } fn server_handler(req: Request, paths: Arc>) -> Result, 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(), };