Skip to content

Cumulus infra tdgoff makefile updates #249

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

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

Cumulus infra tdgoff makefile updates #249

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90c798b
Merge pull request #238 from asfadmin/jk/ETQ-196-add-dynamic-queues
Jkovarik Mar 12, 2026
76df47f
Merge pull request #243 from asfadmin/jk/CUMULUS-4773
Jkovarik Apr 9, 2026
798d376
Merge remote-tracking branch 'origin/main' into cumulus-infra
etcart Apr 23, 2026
346de76
do not try to get CIRRUS versions from git environment if they are al…
tgoff May 14, 2026
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
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@ export TF_VAR_MATURITY=${MATURITY}
export TF_VAR_DEPLOY_NAME=${DEPLOY_NAME}
PYTHON_VER ?= python3

CIRRUS_CORE_VERSION := $(or $(shell git tag --points-at HEAD | head -n1),$(shell git rev-parse --short HEAD))
ifndef CIRRUS_CORE_VERSION
CIRRUS_CORE_VERSION := $(or $(shell git tag --points-at HEAD | head -n1),$(shell git rev-parse --short HEAD))
endif
ifdef DAAC_DIR
CIRRUS_DAAC_VERSION := $(or $(shell git -C $(DAAC_DIR) tag --points-at HEAD | head -n1),$(shell git -C $(DAAC_DIR) rev-parse --short HEAD))
ifndef CIRRUS_DAAC_VERSION
CIRRUS_DAAC_VERSION := $(or $(shell git -C $(DAAC_DIR) tag --points-at HEAD | head -n1),$(shell git -C $(DAAC_DIR) rev-parse --short HEAD))
endif
endif
THIN_EGRESS_LOG_EXIST := "0"

Expand Down
Loading