Merge pull request #88 from Noratrieb/release-every-nightly

emilyalbini · web-flow · commit 44a50666899c · 2025-05-25T22:43:02.000+02:00
Release nightly even if the commit is the same
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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(),
     };

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`# Start a dummy local release process, without making changes to any production`
`3`	`3`	`# system. This requires docker and docker-compose to be installed.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ impl SmokeTester {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`fn server_handler(req: Request<Body>, paths: Arc<Vec<PathBuf>>) -> Result<Response<Body>, Error> {`
`118`		`- let file_name = match req.uri().path().split('/').last() {`
	`118`	`+ let file_name = match req.uri().path().split('/').next_back() {`
`119`	`119`	`Some(file_name) => file_name,`
`120`	`120`	`None => return not_found(),`
`121`	`121`	`};`