Skip to content

Commit a4590a8

Browse files
committed
fix: error: SHA could not be resolved, git returned: b''
1 parent f0b8119 commit a4590a8

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

Dockerfile

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

3-
RUN conda install -y gcc pip poetry=1.1.7
3+
RUN conda install -y gcc pip poetry=1.1.7 git
44
RUN mkdir /workdir
5-
6-
7-
5+
RUN git config --global --add safe.directory /workdir
6+
WORKDIR /workdir
87

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export
3232
# build image
3333
.PHONY:build-image
3434
build-image:
35-
DOCKER_BUILDKIT=1 docker build -t logdna-poetry:local .
35+
DOCKER_BUILDKIT=1 $(DOCKER) build -t logdna-poetry:local .
3636

3737
# This helper function makes debugging much easier.
3838
.PHONY:debug-%
@@ -49,8 +49,8 @@ run: install ## purge build time artifacts
4949
$(DOCKER_COMMAND) bash
5050

5151
.PHONY:clean
52-
clean: ## purge build time artifacts
53-
rm -rf dist/ build/ coverage/ pypoetry/ pip/ **/__pycache__/ .pytest_cache/ .cache .coverage
52+
clean: build-image ## purge build time artifacts
53+
$(POETRY_COMMAND) run rm -rf dist/ build/ coverage/ pypoetry/ pip/ **/__pycache__/ .pytest_cache/ .cache .coverage
5454

5555
.PHONY:changelog
5656
changelog: install ## print the next version of the change log to stdout
@@ -62,7 +62,7 @@ install: build-image ## install development and build time dependencies
6262

6363
.PHONY:lint
6464
lint: install ## run lint rules and print error report
65-
$(POETRY_COMMAND) run task lint
65+
lint
6666

6767
.PHONY:lint-fix
6868
lint-fix: install ## attempt to auto fix linting error and report remaining errors
@@ -78,7 +78,7 @@ release: clean install fetch-tags ## run semantic release build and publish resu
7878

7979
.PHONY: fetch-tags
8080
fetch-tags: ## workaround for jenkins repo cloning behavior
81-
git config remote.origin.url "https://logdnabot:${GH_TOKEN}@github.com/logdna/python"
81+
#git config remote.origin.url "https://logdnabot:${GH_TOKEN}@github.com/logdna/python"
8282
git fetch origin --tags
8383

8484
.PHONY:release-dry

poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ yapf = "^0.30.0"
2525
pytest = "^6.2.2"
2626
pytest-cov = "^2.11.1"
2727
taskipy = "^1.6.0"
28-
python-semantic-release = "^7.15.3"
28+
python-semantic-release = "^7.28.1"
2929
responses = "^0.20.0"
3030

3131
[tool.taskipy.tasks]

0 commit comments

Comments
 (0)