Skip to content

Commit 34c8f32

Browse files
Fix sed expression in makefiles (caraml-dev#415)
1 parent 68d7418 commit 34c8f32

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

engines/pyfunc-ensembler-job/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ACTIVATE_ENV = source $$(conda info --base)/etc/profile.d/conda.sh ; conda activ
88
setup: build
99
@conda env update -f env.yaml -n $(CONDA_ENV_NAME) --prune
1010
@DIST_VERSION=$$(echo $(VERSION) | \
11-
sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+)(-rc([0-9]+))?/\1rc\3/'); \
11+
sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+)-rc([0-9]+)/\1rc\2/; s/^v([0-9]+\.[0-9]+\.[0-9]+)/\1/'); \
1212
$(ACTIVATE_ENV) && pip install "dist/turing_pyfunc_ensembler_job-$${DIST_VERSION}-py3-none-any.whl[dev]"
1313

1414
.PHONY: type-check

engines/pyfunc-ensembler-service/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ACTIVATE_ENV = source $$(conda info --base)/etc/profile.d/conda.sh ; conda activ
88
setup: build
99
@conda env update -f env.yaml -n $(CONDA_ENV_NAME) --prune
1010
@DIST_VERSION=$$(echo $(VERSION) | \
11-
sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+)(-rc([0-9]+))?/\1rc\3/'); \
11+
sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+)-rc([0-9]+)/\1rc\2/; s/^v([0-9]+\.[0-9]+\.[0-9]+)/\1/'); \
1212
$(ACTIVATE_ENV) && pip install "dist/turing_pyfunc_ensembler_service-$${DIST_VERSION}-py3-none-any.whl[dev]"
1313

1414
.PHONY: lint

0 commit comments

Comments
 (0)