Skip to content

Commit b158130

Browse files
author
GitHub Actions
committed
Regenerate static files
1 parent 7a638b6 commit b158130

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

static-commontooling/docker/Dockerfile_multi_macros.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ENTRYPOINT []
107107
FROM layer AS zip
108108
WORKDIR {{ workdir }}
109109

110-
RUN yum -y install zip
110+
RUN dnf -y install zip
111111

112112
ENTRYPOINT ["zip", "-r", "-", "."]
113113
{%- endmacro %}

static-commontooling/make/pythonic.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ TWINE_REPO_PASSWORD?=
106106

107107
TWINE_VOLUMES=-v $(shell realpath $(topdir)):/data:ro
108108

109-
TWINE_FLAGS= \
110-
--skip-existing \
111-
--non-interactive
109+
TWINE_FLAGS=--non-interactive
112110

113111
ifneq "${TWINE_REPO}" ""
114112
TWINE_FLAGS += --repository-url ${TWINE_REPO}
@@ -136,6 +134,9 @@ TWINE=$(DOCKER) run --rm $(TWINE_VOLUMES) public.ecr.aws/o4o2s1w1/cloudfit/twine
136134
enable_push=TRUE
137135
ifneq "$(TWINE_REPO)" "https://artifactory.labs.bbc/artifactory/api/pypi/ap-python"
138136
ifneq "$(TWINE_REPO)" "https://api.artifactory.labs.bbc/artifactory/api/pypi/ap-python"
137+
138+
TWINE_FLAGS += --skip-existing
139+
139140
ifneq "${NEXT_VERSION}" "${VERSION}"
140141
enable_push=FALSE
141142
endif

0 commit comments

Comments
 (0)