From 691abafa2d42ccc451ffcbba7579eb6c4589622c Mon Sep 17 00:00:00 2001 From: 0xfourzerofour Date: Mon, 30 Oct 2023 16:40:42 -0400 Subject: [PATCH] chore(docker): set env variable outside --- .github/workflows/docker-release.yaml | 1 + Makefile | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml index 72c8def46..43ef16f6e 100644 --- a/.github/workflows/docker-release.yaml +++ b/.github/workflows/docker-release.yaml @@ -51,4 +51,5 @@ jobs: run: | cargo install cross --git https://github.com/cross-rs/cross export PROFILE=release + export GIT_TAG=$(shell git describe --tags --abbrev=0) sudo -E env "PATH=$PATH" make docker-build-latest diff --git a/Makefile b/Makefile index fe28c722a..75bc8a059 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ PROFILE ?= release DOCKER_IMAGE_NAME ?= alchemyplatform/rundler BIN_DIR = "dist/bin" BUILD_PATH = "target" -GIT_TAG ?= $(shell git describe --tags --abbrev=0) .PHONY: build build: ## Build the project. @@ -38,8 +37,6 @@ test-spec-modular: ## Run spec tests in modular mode submodule-update: ## Run spec tests in modular mode git submodule update -# Note: The additional rustc compiler flags are for intrinsics needed by MDBX. -# See: https://github.com/cross-rs/cross/wiki/FAQ#undefined-reference-with-build-std build-%: cross build --bin rundler --target $* --profile "$(PROFILE)"