Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update injector make #2915

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

chore: update injector make #2915

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
159783e
rework injector make
AustinAbro321 Aug 20, 2024
4fa3e3d
make file
AustinAbro321 Aug 21, 2024
02a1f05
make file edits
AustinAbro321 Aug 21, 2024
4f607f1
add arm build
AustinAbro321 Aug 21, 2024
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
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ build-examples: ## Build all of the example packages

@test -s ./build/zarf-package-component-webhooks-$(ARCH)-0.0.1.tar.zst || $(ZARF_BIN) package create examples/component-webhooks -o build -a $(ARCH) --confirm

build-injector-linux: ## Build the Zarf injector for AMD64 and ARM64
docker run --rm --user "$(id -u)":"$(id -g)" -v $$PWD/src/injector:/usr/src/zarf-injector -w /usr/src/zarf-injector rust:1.71.0-bookworm make build-injector-linux list-sizes

## NOTE: Requires an existing cluster or the env var APPLIANCE_MODE=true
.PHONY: test-e2e
test-e2e: test-e2e-without-cluster test-e2e-with-cluster ## Run all of the core Zarf CLI E2E tests (builds any deps that aren't present)
Expand Down
8 changes: 4 additions & 4 deletions packages/zarf-registry/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ components:
architecture: amd64
files:
# Rust Injector Binary
- source: https://zarf-init.s3.us-east-2.amazonaws.com/injector/###ZARF_PKG_TMPL_INJECTOR_VERSION###/zarf-injector-amd64
- source: ../../src/injector/target/x86_64-unknown-linux-musl/release/zarf-injector
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just changed for testing, will revert this file before merge

target: "###ZARF_TEMP###/zarf-injector"
shasum: "###ZARF_PKG_TMPL_INJECTOR_AMD64_SHASUM###"
# shasum: "###ZARF_PKG_TMPL_INJECTOR_AMD64_SHASUM###"
executable: true

- name: zarf-injector
Expand All @@ -126,9 +126,9 @@ components:
architecture: arm64
files:
# Rust Injector Binary
- source: https://zarf-init.s3.us-east-2.amazonaws.com/injector/###ZARF_PKG_TMPL_INJECTOR_VERSION###/zarf-injector-arm64
- source: ../../src/injector/target/aarch64-unknown-linux-musl/release/zarf-injector
target: "###ZARF_TEMP###/zarf-injector"
shasum: "###ZARF_PKG_TMPL_INJECTOR_ARM64_SHASUM###"
# shasum: "###ZARF_PKG_TMPL_INJECTOR_ARM64_SHASUM###"
executable: true

- name: zarf-seed-registry
Expand Down
53 changes: 6 additions & 47 deletions src/injector/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,59 +10,18 @@ help: ## Display this help information
clean: ## Clean the build directory
rm -rf target

cross-injector-linux: cross-injector-amd cross-injector-arm

cross-injector-amd:
rustup target add x86_64-unknown-linux-musl
test -s x86_64-linux-musl-cross || curl https://zarf-public.s3-us-gov-west-1.amazonaws.com/pipelines/x86_64-linux-musl-cross.tgz | tar -xz
export PATH="$$PWD/x86_64-linux-musl-cross/bin:$$PATH"
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-linux-musl-cc

cargo install cross --git https://github.com/cross-rs/cross

cross build --target x86_64-unknown-linux-musl --release


cross-injector-arm:
rustup target add aarch64-unknown-linux-musl
test -s aarch64-linux-musl-cross || curl https://zarf-public.s3-us-gov-west-1.amazonaws.com/pipelines/aarch64-linux-musl-cross.tgz | tar -xz
export PATH="$$PWD/aarch64-linux-musl-cross/bin:$$PATH"
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-cc

cross build --target aarch64-unknown-linux-musl --release


install-cross:
cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.5

build-injector-linux: build-injector-linux-amd build-injector-linux-arm ## Build the Zarf injector for AMD64 and ARM64

build-injector-linux-amd: ## Build the Zarf injector for AMD64
rustup target add x86_64-unknown-linux-musl

if [ "$(shell uname -m)" = "arm64" ] || [ "$(shell uname -m)" = "aarch64" ]; then \
test -s x86_64-linux-musl-cross || curl https://zarf-public.s3-us-gov-west-1.amazonaws.com/pipelines/x86_64-linux-musl-cross.tgz | tar -xz; \
export PATH="$$PWD/x86_64-linux-musl-cross/bin:$$PATH"; \
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=x86_64-linux-musl-cc; \
cargo build --target x86_64-unknown-linux-musl --release; \
elif [ "$(shell uname -m)" = "x86_64" ]; then \
cargo build --target x86_64-unknown-linux-musl --release; \
fi

build-injector-linux-arm: ## Build the Zarf injector for ARM64
rustup target add aarch64-unknown-linux-musl
build-injector-linux-amd: install-cross
cross build --target aarch64-unknown-linux-musl --release

if [ "$(shell uname -m)" = "arm64" ] || [ "$(shell uname -m)" = "aarch64" ]; then \
cargo build --target aarch64-unknown-linux-musl --release; \
elif [ "$(shell uname -m)" = "x86_64" ]; then \
test -s aarch64-linux-musl-cross || curl https://zarf-public.s3-us-gov-west-1.amazonaws.com/pipelines/aarch64-linux-musl-cross.tgz | tar -xz; \
export PATH="$$PWD/aarch64-linux-musl-cross/bin:$$PATH"; \
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-musl-cc; \
cargo build --target aarch64-unknown-linux-musl --release; \
fi
build-injector-linux-arm: install-cross
cross build --target x86_64-unknown-linux-musl --release

list-sizes: ## List the sizes of the Zarf injector binaries
@echo '\n\033[0;36mSize of Zarf injector binaries:\033[0m\n'; \
du --si target/x86_64-unknown-linux-musl/release/zarf-injector; \
du --si target/aarch64-unknown-linux-musl/release/zarf-injector

build-with-docker: ## Build the Zarf injector using Docker
docker run --rm --user "$(id -u)":"$(id -g)" -v $$PWD:/usr/src/zarf-injector -w /usr/src/zarf-injector rust:1.71.0-bookworm make build-injector-linux
Loading