From fdb751e6fd72083ee6972bf626f3f9ce8e2d697b Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:44:10 -0400 Subject: [PATCH] move eval --- flatpaks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpaks/Makefile b/flatpaks/Makefile index 9a82b85..8a6446e 100644 --- a/flatpaks/Makefile +++ b/flatpaks/Makefile @@ -4,7 +4,7 @@ full_list: repo repo: script.sh $(eval IMAGE=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)) - $(if $(GITHUB_WORKSPACE),$(eval FLATPAK_DIR=$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD))) + $(eval FLATPAK_DIR=$(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD))) $(if $(GITHUB_WORKSPACE),cp script.sh $(GITHUB_WORKSPACE)/$(FLATPAK_DIR)/) docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume $(_BASE_DIR)/flatpaks:/flatpak_dir $(IMAGE) /flatpak_dir/script.sh $(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(notdir $(FLATPAK_DIR))" >> $(GITHUB_OUTPUT))