feat: Stages

.rusty-hook.toml

@@ -1,5 +1,5 @@
 [hooks]
-pre-commit = "cargo fmt --check && cargo test && cargo clippy -- -D warnings"
+pre-commit = "cargo fmt --check && cargo test --all-features && cargo clippy --all-features -- -D warnings"
 
 [logging]
 verbose = true

Cargo.toml

@@ -84,6 +84,8 @@ uuid.workspace = true
 
 [features]
 default = []
+stages = ["blue-build-recipe/stages"]
+copy = ["blue-build-recipe/copy"]
 
 [dev-dependencies]
 rusty-hook = "0.11.2"

Earthfile

@@ -1,7 +1,7 @@
 VERSION 0.8
 PROJECT blue-build/cli
 
-IMPORT github.com/blue-build/earthly-lib/cargo AS cargo
+IMPORT github.com/earthly/lib/rust AS rust
 
 ARG --global IMAGE=ghcr.io/blue-build/cli
 
@@ -21,17 +21,29 @@ build:
 
 lint:
 	FROM +common
-	DO cargo+LINT
+	DO rust+CARGO --args="clippy -- -D warnings"
+	DO rust+CARGO --args="clippy --all-features -- -D warnings"
+	DO rust+CARGO --args="clippy --no-default-features -- -D warnings"
 
 test:
 	FROM +common
-	DO cargo+TEST
+	DO rust+CARGO --args="test -- --show-output"
+	DO rust+CARGO --args="test --all-features -- --show-output"
+	DO rust+CARGO --args="test --no-default-features -- --show-output"
 
 install:
 	FROM +common
 	ARG --required BUILD_TARGET
 
-	DO cargo+BUILD_RELEASE --BUILD_TARGET=$BUILD_TARGET
+	DO rust+CARGO --args="build --release --target $BUILD_TARGET" --output="$BUILD_TARGET/release/[^\./]+"
+
+	SAVE ARTIFACT target/$BUILD_TARGET/release/bluebuild
+
+install-all-features:
+	FROM +common
+	ARG --required BUILD_TARGET
+
+	DO rust+CARGO --args="build --all-features --release --target $BUILD_TARGET" --output="$BUILD_TARGET/release/[^\./]+"
 
 	SAVE ARTIFACT target/$BUILD_TARGET/release/bluebuild
 
@@ -47,7 +59,7 @@ common:
 	COPY --keep-ts --dir .git/ /app
 	RUN touch build.rs
 
-	DO cargo+INIT
+	DO rust+INIT --keep_fingerprints=true
 
 build-scripts:
 	FROM alpine
@@ -65,8 +77,6 @@ blue-build-cli:
 	FROM $BASE_IMAGE
 	LABEL org.opencontainers.image.base.name="$BASE_IMAGE"
 
-	BUILD +install --BUILD_TARGET="x86_64-unknown-linux-gnu"
-
 	RUN dnf -y install dnf-plugins-core \
 		&& dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo \
 		&& dnf install --refresh -y \
@@ -84,7 +94,7 @@ blue-build-cli:
 
 	COPY +cosign/cosign /usr/bin/cosign
 
-	COPY (+install/bluebuild --BUILD_TARGET="x86_64-unknown-linux-gnu") /usr/bin/bluebuild
+	DO --pass-args +INSTALL --OUT_DIR="/usr/bin/" --BUILD_TARGET="x86_64-unknown-linux-gnu"
 
 	RUN mkdir -p /bluebuild
 	WORKDIR /bluebuild
@@ -97,14 +107,12 @@ blue-build-cli-alpine:
 	FROM $BASE_IMAGE
 	LABEL org.opencontainers.image.base.name="$BASE_IMAGE"
 
-	BUILD +install --BUILD_TARGET="x86_64-unknown-linux-musl"
-
 	RUN apk update && apk add buildah podman skopeo fuse-overlayfs jq
 
 	LABEL org.opencontainers.image.base.digest="$(skopeo inspect "docker://$BASE_IMAGE" | jq -r '.Digest')"
 
 	COPY +cosign/cosign /usr/bin/cosign
-	COPY (+install/bluebuild --BUILD_TARGET="x86_64-unknown-linux-musl") /usr/bin/bluebuild
+	DO --pass-args +INSTALL --OUT_DIR="/usr/bin/" --BUILD_TARGET="x86_64-unknown-linux-musl"
 
 	RUN mkdir -p /bluebuild
 	WORKDIR /bluebuild
@@ -121,7 +129,7 @@ installer:
 
 	LABEL org.opencontainers.image.base.digest="$(skopeo inspect "docker://$BASE_IMAGE" | jq -r '.Digest')"
 
-	COPY (+install/bluebuild --BUILD_TARGET="x86_64-unknown-linux-musl") /out/bluebuild
+	DO --pass-args +INSTALL --OUT_DIR="/out/" --BUILD_TARGET="x86_64-unknown-linux-musl"
 	COPY install.sh /install.sh
 
 	CMD ["cat", "/install.sh"]
@@ -146,6 +154,18 @@ version:
 
 	SAVE ARTIFACT /version
 
+INSTALL:
+	FUNCTION
+	ARG TAGGED="false"
+	ARG --required BUILD_TARGET
+	ARG --required OUT_DIR
+
+	IF [ "$TAGGED" = "true" ]
+		COPY (+install/bluebuild --BUILD_TARGET="$BUILD_TARGET") $OUT_DIR
+	ELSE
+		COPY (+install-all-features/bluebuild --BUILD_TARGET="$BUILD_TARGET") $OUT_DIR
+	END
+
 SAVE_IMAGE:
 	FUNCTION
 	ARG SUFFIX=""

integration-tests/Earthfile

@@ -92,11 +92,17 @@ secureblue-base:
 	DO +GEN_KEYPAIR
 
 legacy-base:
-	FROM +test-base
+	FROM ../+blue-build-cli-alpine
+	ENV BB_TEST_LOCAL_IMAGE=/etc/bluebuild/cli_test.tar.gz
+	ENV CLICOLOR_FORCE=1
 
-	RUN rm -fr /test
+	COPY ./mock-scripts/ /usr/bin/
+
+	WORKDIR /test
 	COPY ./legacy-test-repo /test
 
+	DO ../+INSTALL --OUT_DIR="/usr/bin/" --BUILD_TARGET="x86_64-unknown-linux-musl" --TAGGED="true"
+
 	DO +GEN_KEYPAIR
 
 test-base:

integration-tests/test-repo/files/scripts/bluebuild.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+cargo install blue-build --debug --all-features --target x86_64-unknown-linux-gnu
+mkdir -p /out/
+mv $CARGO_HOME/bin/bluebuild /out/bluebuild

integration-tests/test-repo/recipes/bluebuild.yml

@@ -0,0 +1,12 @@
+stages:
+  - name: blue-build
+    image: rust
+    modules:
+      - type: script
+        scripts:
+          - bluebuild.sh
+modules:
+  - type: copy
+    from: blue-build
+    src: /out/bluebuild
+    dest: /usr/bin/bluebuild

integration-tests/test-repo/recipes/recipe.yml

@@ -1,10 +1,12 @@
 name: cli/test
-description: This is my personal OS image.
-base-image: ghcr.io/ublue-os/silverblue-main
 alt-tags:
   - gts
   - stable
+description: This is my personal OS image.
+base-image: ghcr.io/ublue-os/silverblue-main
 image-version: 40
+stages:
+  - from-file: stages.yml
 modules:
   - from-file: akmods.yml
   - from-file: flatpaks.yml
@@ -36,3 +38,20 @@ modules:
       - labels
     snippets:
       - RUN echo "This is a snippet" && ostree container commit
+
+  - type: copy
+    from: alpine-test
+    src: /test.txt
+    dest: /
+  - type: copy
+    from: ubuntu-test
+    src: /test.txt
+    dest: /
+  - type: copy
+    from: debian-test
+    src: /test.txt
+    dest: /
+  - type: copy
+    from: fedora-test
+    src: /test.txt
+    dest: /

integration-tests/test-repo/recipes/stages.yml

@@ -0,0 +1,32 @@
+stages:
+  - name: ubuntu-test
+    from: ubuntu
+    modules:
+      - from-file: stages.yml
+  - name: debian-test
+    from: debian
+    modules:
+      - from-file: stages.yml
+  - name: fedora-test
+    from: fedora
+    modules:
+      - from-file: stages.yml
+  - name: alpine-test
+    from: alpine
+    modules:
+      - from-file: stages.yml
+modules:
+  - type: files
+    files:
+      - usr: /usr
+  - type: script
+    scripts:
+      - example.sh
+    snippets:
+      - echo "test" > /test.txt
+  - type: test-module
+  - type: containerfile
+    containerfiles:
+      - labels
+    snippets:
+      - RUN echo "This is a snippet"

modules.json

@@ -1,3 +1,4 @@
 [
-  "https://raw.githubusercontent.com/blue-build/cli/main/template/templates/modules/containerfile/module.yml"
+  "https://raw.githubusercontent.com/blue-build/cli/main/template/templates/modules/containerfile/module.yml",
+  "https://raw.githubusercontent.com/blue-build/cli/main/template/templates/modules/copy/module.yml"
 ]

recipe/Cargo.toml

@@ -14,11 +14,17 @@ chrono = "0.4"
 indexmap = { version = "2", features = ["serde"] }
 
 anyhow.workspace = true
+colored.workspace = true
 log.workspace = true
 serde.workspace = true
 serde_yaml.workspace = true
 serde_json.workspace = true
 typed-builder.workspace = true
 
+[features]
+default = []
+stages = []
+copy = []
+
 [lints]
 workspace = true

recipe/src/lib.rs

@@ -2,8 +2,12 @@ pub mod akmods_info;
 pub mod module;
 pub mod module_ext;
 pub mod recipe;
+pub mod stage;
+pub mod stages_ext;
 
 pub use akmods_info::*;
 pub use module::*;
 pub use module_ext::*;
 pub use recipe::*;
+pub use stage::*;
+pub use stages_ext::*;