Skip to content

Commit 541b6e9

Browse files
committed
fix: update pull request workflow to specify branch for testing
fix: correct test report generation in Makefile
1 parent c3d7038 commit 541b6e9

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/OnPullRequest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: On Pull Request
22
on:
33
pull_request:
44
branches:
5-
- "*"
5+
- "WORKFLOW_DISABLED" # Change this to the branch you want to test pull requests against
66

77
permissions:
88
contents: read

makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ server: $(SRV_DIST) $(CONFIG_DIST)
135135

136136

137137

138-
# test-report.xml: $(APP_EXECUTABLE) $(WEB_DIST) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(TESTS_PY)
139-
# $(PYTHON) -m pytest --junitxml=test-report.xml tests
138+
test-report.xml: $(APP_EXECUTABLE) $(WEB_DIST) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(TESTS_PY)
139+
$(PYTHON) -m pytest --junitxml=test-report.xml tests
140140

141141

142142
install: $(APP_EXECUTABLE)
@@ -150,7 +150,7 @@ start: install
150150

151151

152152

153-
# tests: clean-tests test-report.xml
153+
tests: clean-tests test-report.xml
154154

155155

156156
clean:

0 commit comments

Comments
 (0)