Skip to content

Commit f5edbcd

Browse files
committed
Fix env issues.
1 parent 5cb4866 commit f5edbcd

File tree

2 files changed

+46
-14
lines changed

2 files changed

+46
-14
lines changed

.github/workflows/pricing.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ jobs:
7373
fi
7474
fi
7575
76+
echo "Debug before GITHUB_OUTPUT: FINAL_MUTANT_MODE='${FINAL_MUTANT_MODE}'"
77+
echo "Debug before GITHUB_OUTPUT: FINAL_SINCE_TARGET='${FINAL_SINCE_TARGET}'"
78+
echo "Debug before GITHUB_OUTPUT: FINAL_NUM_GROUPS='${FINAL_NUM_GROUPS}'"
79+
7680
echo "mutant_mode=${FINAL_MUTANT_MODE}" >> $GITHUB_OUTPUT
7781
echo "mutant_since_target=${FINAL_SINCE_TARGET}" >> $GITHUB_OUTPUT
7882
echo "num_groups=${FINAL_NUM_GROUPS}" >> $GITHUB_OUTPUT
@@ -201,7 +205,15 @@ jobs:
201205
bundler-cache: true
202206
working-directory: ${{ env.WORKING_DIRECTORY }}
203207
- name: Run mutation tests (parallel group for pricing)
204-
run: make mutate
208+
run: |
209+
echo "Debug from CI step before calling make (using PASSED_ var names):"
210+
echo " Value for PASSED_MODE='${{ env.ENV_CLI_MUTANT_MODE }}'"
211+
echo " Value for PASSED_SINCE_TARGET='${{ env.ENV_CLI_MUTANT_SINCE_TARGET }}'"
212+
echo " CI_MUTATE_SUBJECTS (from env): '${{ env.CI_MUTATE_SUBJECTS }}'"
213+
214+
make mutate \
215+
PASSED_MODE="${{ env.ENV_CLI_MUTANT_MODE }}" \
216+
PASSED_SINCE_TARGET="${{ env.ENV_CLI_MUTANT_SINCE_TARGET }}"
205217
working-directory: ${{ env.WORKING_DIRECTORY }}
206218
env:
207219
CI_MUTATE_SUBJECTS: ${{ matrix.subject_group }}

ecommerce/pricing/Makefile

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
MUTANT_MODE_INTERNAL := $(PASSED_MODE)
2+
MUTANT_SINCE_TARGET_INTERNAL := $(PASSED_SINCE_TARGET)
3+
14
install:
25
@bundle install
36

@@ -6,28 +9,45 @@ test:
69
@bundle exec ruby -e "require \"rake/rake_test_loader\"" test/*_test.rb
710

811
mutate:
9-
$(eval ACTUAL_MUTANT_ARGS :=)
12+
@echo "--- Makefile Debug: Initial State ---"
13+
@echo "PASSED_MODE (from CLI): '$(PASSED_MODE)'"
14+
@echo "PASSED_SINCE_TARGET (from CLI): '$(PASSED_SINCE_TARGET)'"
15+
@echo "CI_MUTATE_SUBJECTS (from environment): '$(CI_MUTATE_SUBJECTS)'"
16+
17+
@echo "--- Makefile Debug: After Internal Assignment ---"
18+
@echo "MUTANT_MODE_INTERNAL (after assign): '$(MUTANT_MODE_INTERNAL)'"
19+
@echo "MUTANT_SINCE_TARGET_INTERNAL (after assign):'$(MUTANT_SINCE_TARGET_INTERNAL)'"
20+
1021
$(eval SUBJECTS_TO_RUN := $(strip $(CI_MUTATE_SUBJECTS)))
22+
$(eval TEMP_ACTUAL_MUTANT_ARGS :=)
1123

1224
@echo "--- Preparing Mutation Test Run for pricing ---"
13-
ifeq ($(MUTANT_MODE),incremental)
14-
ifndef MUTANT_SINCE_TARGET
15-
$(error MUTANT_MODE is 'incremental', but MUTANT_SINCE_TARGET is not set. This variable should be set by the CI workflow.)
25+
ifeq ($(MUTANT_MODE_INTERNAL),incremental)
26+
@echo " Conditional: MUTANT_MODE_INTERNAL is 'incremental'."
27+
ifndef MUTANT_SINCE_TARGET_INTERNAL
28+
$(error FATAL ERROR (Makefile): MUTANT_MODE_INTERNAL ('$(MUTANT_MODE_INTERNAL)') is incremental, but MUTANT_SINCE_TARGET_INTERNAL is NOT DEFINED. PASSED_SINCE_TARGET was '$(PASSED_SINCE_TARGET)'.)
1629
endif
17-
$(eval ACTUAL_MUTANT_ARGS := --since $(MUTANT_SINCE_TARGET))
18-
@echo "Mutation Mode: Incremental"
19-
@echo "Target for --since: $(MUTANT_SINCE_TARGET)"
30+
ifeq ($(strip $(MUTANT_SINCE_TARGET_INTERNAL)),)
31+
$(error FATAL ERROR (Makefile): MUTANT_MODE_INTERNAL ('$(MUTANT_MODE_INTERNAL)') is incremental, but MUTANT_SINCE_TARGET_INTERNAL IS EMPTY. PASSED_SINCE_TARGET was '$(PASSED_SINCE_TARGET)', internal value was '[$(MUTANT_SINCE_TARGET_INTERNAL)]'.)
32+
endif
33+
34+
@echo " MUTANT_SINCE_TARGET_INTERNAL appears to be set and non-empty: '[$(MUTANT_SINCE_TARGET_INTERNAL)]'"
35+
$(eval TEMP_ACTUAL_MUTANT_ARGS := --since $(MUTANT_SINCE_TARGET_INTERNAL))
36+
@echo " Action: Set for Incremental Mutation."
37+
@echo " Target for --since: '$(MUTANT_SINCE_TARGET_INTERNAL)'"
2038
else
21-
@echo "Mutation Mode: Full"
39+
@echo " Conditional: MUTANT_MODE_INTERNAL is NOT 'incremental' (actual value: '$(MUTANT_MODE_INTERNAL)'). Setting for Full Mutation."
2240
endif
2341

42+
@echo " Final TEMP_ACTUAL_MUTANT_ARGS: '$(TEMP_ACTUAL_MUTANT_ARGS)'"
2443
ifeq ($(SUBJECTS_TO_RUN),)
25-
@echo "Subjects: All relevant (within scope of full/incremental mode)"
44+
@echo " Subjects: All relevant (within scope of full/incremental mode)"
2645
else
27-
@echo "Subjects: Specific group for CI - '$(SUBJECTS_TO_RUN)'"
46+
@echo " Subjects: Specific group for CI - '$(SUBJECTS_TO_RUN)'"
2847
endif
29-
@echo "------------------------------------"
30-
@echo "Executing: bundle exec mutant run $(ACTUAL_MUTANT_ARGS) $(SUBJECTS_TO_RUN)"
31-
@bundle exec mutant run $(ACTUAL_MUTANT_ARGS) $(SUBJECTS_TO_RUN)
48+
@echo "-----------------------------------------------------"
49+
50+
@echo "Executing: bundle exec mutant run $(TEMP_ACTUAL_MUTANT_ARGS) $(SUBJECTS_TO_RUN)"
51+
@bundle exec mutant run $(TEMP_ACTUAL_MUTANT_ARGS) $(SUBJECTS_TO_RUN)
3252

3353
.PHONY: install test mutate

0 commit comments

Comments
 (0)