Skip to content

Commit

Permalink
Hotfix test faster local build (#1282)
Browse files Browse the repository at this point in the history
  • Loading branch information
Racer159 authored Jan 28, 2023
1 parent 5b1aeff commit 629cd66
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/actions/packages/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ runs:
using: composite
steps:
- run: |
make init-package build-examples ARCH=amd64
make build-cli-linux-amd init-package build-examples ARCH=amd64
shell: bash
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,11 @@ init-package-local-agent:
@test "$(AGENT_IMAGE)" != "agent:local" || $(MAKE) build-local-agent-image

build-local-agent-image: ## Build the Zarf agent image to be used in a locally built init package
$(MAKE) build-cli-linux
cp build/zarf build/zarf-linux-amd64
cp build/zarf-arm build/zarf-linux-arm64
docker build --build-arg TARGETARCH=$(ARCH) --platform linux/$(ARCH) --tag ghcr.io/defenseunicorns/zarf/agent:local .
@ if [ "$(ARCH)" = "amd64" ] && [ ! -s ./build/zarf ]; then $(MAKE) build-cli-linux-amd; fi
@ if [ "$(ARCH)" = "amd64" ]; then cp build/zarf build/zarf-linux-amd64; fi
@ if [ "$(ARCH)" = "arm64" ] && [ ! -s ./build/zarf-arm ]; then $(MAKE) build-cli-linux-arm; fi
@ if [ "$(ARCH)" = "arm64" ]; then cp build/zarf-arm build/zarf-linux-arm64; fi
docker buildx build --platform linux/$(ARCH) --tag ghcr.io/defenseunicorns/zarf/agent:local .

init-package: ## Create the zarf init package (must `brew install coreutils` on macOS and have `docker` first)
@test -s $(ZARF_BIN) || $(MAKE) build-cli
Expand Down

0 comments on commit 629cd66

Please sign in to comment.