Skip to content

Commit 1f1a16a

Browse files
committed
FIx ci
1 parent 40c8409 commit 1f1a16a

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

.dockerignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
target/
2+
node_modules/
3+
.git/
4+
api/target/
5+
cli/target/
6+
generator/target/
7+
docs/node_modules/
8+
cli/node_modules/

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ FROM rust:1-alpine AS builder
22
WORKDIR /usr/src/luna
33
COPY . .
44
# Install build tools and Node.js for npm dependencies required by cli/build.rs
5-
RUN apk add --no-cache build-base nodejs npm
5+
RUN apk add --no-cache build-base nodejs npm pkgconfig openssl-dev openssl-libs-static
66
# Install pnpm
77
RUN npm install --global corepack@latest
88
# Install package.json dependencies in cli directoy
99
WORKDIR /usr/src/luna/cli
10+
ENV CI=true
1011
RUN pnpm install
1112
# Build and install the CLI
1213
WORKDIR /usr/src/luna

cli/src/docs.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,8 @@ fn download_asset(
164164

165165
if target_path.exists() {
166166
if let Some(expected) = expected_sha256 {
167-
if let Ok(actual) = calculate_sha256(&target_path) {
168-
if actual == expected {
169-
return Ok(rel_path.to_string());
170-
}
167+
if calculate_sha256(&target_path).is_ok_and(|actual| actual == expected) {
168+
return Ok(rel_path.to_string());
171169
}
172170
} else {
173171
// For images without explicit checksums, we assume they are correct if they exist

0 commit comments

Comments
 (0)