Skip to content

Commit bb91457

Browse files
committed
fixed jenkins pipeline
1 parent 7302a71 commit bb91457

File tree

7 files changed

+496
-404
lines changed

7 files changed

+496
-404
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
FROM condaforge/miniforge3:4.12.0-0
22

3-
RUN conda install -y pip poetry=1.1.7 pytest responses
4-
RUN pip install tap.py
3+
RUN conda install -y gcc pip poetry=1.1.7
4+
RUN mkdir /workdir
5+
6+
57

68

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pipeline {
3333
always {
3434
junit 'coverage/test.xml'
3535
publishHTML target: [
36-
allowMissing: false,
36+
allowMissing: true,
3737
alwaysLinkToLastBuild: false,
3838
keepAll: true,
3939
reportDir: 'coverage',

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@ help: ## Show this help, includes list of all actions.
4545
@awk 'BEGIN {FS = ":.*?## "}; /^.+: .*?## / && !/awk/ {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' ${MAKEFILE_LIST}
4646

4747
.PHONY:run
48-
run: build-image ## purge build time artifacts
48+
run: install ## purge build time artifacts
4949
$(DOCKER_COMMAND) bash
5050

5151
.PHONY:clean
5252
clean: ## purge build time artifacts
5353
rm -rf dist/ build/ coverage/ pypoetry/ pip/ **/__pycache__/ .pytest_cache/ .cache .coverage
5454

5555
.PHONY:changelog
56-
changelog: build-image ## print the next version of the change log to stdout
56+
changelog: install ## print the next version of the change log to stdout
5757
$(POETRY_COMMAND) run semantic-release changelog --unreleased
5858

5959
.PHONY:install
6060
install: build-image ## install development and build time dependencies
61-
$(POETRY_COMMAND) install --no-interaction -vvv
61+
$(POETRY_COMMAND) install --no-interaction
6262

6363
.PHONY:lint
64-
lint: build-image ## run lint rules and print error report
64+
lint: install ## run lint rules and print error report
6565
$(POETRY_COMMAND) run task lint
6666

6767
.PHONY:lint-fix
68-
lint-fix: build-image ## attempt to auto fix linting error and report remaining errors
68+
lint-fix: install ## attempt to auto fix linting error and report remaining errors
6969
$(POETRY_COMMAND) run task lint:fix
7070

7171
.PHONY:package
72-
package: build-image ## Generate a python sdist and wheel
72+
package: install ## Generate a python sdist and wheel
7373
$(POETRY_COMMAND) build
7474

7575
.PHONY:release
@@ -98,5 +98,5 @@ release-major: clean install ## run semantic release build an
9898
$(POETRY_COMMAND) run semantic-release publish --major
9999

100100
.PHONY:test
101-
test: build-image ## run project test suite
102-
$(POETRY_COMMAND) run pytest tests/
101+
test: install ## run project test suite
102+
$(POETRY_COMMAND) run task test

logdna/logdna.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ def send_request(self, data):
205205
return True
206206

207207
if status_code in [400]:
208-
self.internalLogger.debug('The request failed %s. Discarding flush buffer',
208+
self.internalLogger.debug('The request failed %s.' +
209+
'Discarding flush buffer',
209210
response.reason)
210211
return True
211212

0 commit comments

Comments
 (0)