Skip to content

Commit a380167

Browse files
committedJan 31, 2025·
Simplify installation of oca-gen-addon-icon
The icon generator will not overwrite existing icons, so there is no need to pin it. The pinning was initially done out of fear an icon generator update would overwrite all icons at once.
1 parent f7dbd8a commit a380167

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed
 

‎Dockerfile

+1-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ RUN set -x \
2323
# The main branch bot needs several other command line tools from in OCA/maintainer-tools
2424
# we install them in a separate virtualenv to avoid polluting our main environment.
2525

26-
# Install a specific version of icon generator, to ensure stability as any tiny change
27-
# in generated output may create many commits on all addons.
28-
RUN set -x \
29-
&& python${PY} -m venv /ocamt-pinned \
30-
&& /ocamt-pinned/bin/pip install --no-cache-dir -U pip wheel
31-
RUN set -x \
32-
&& /ocamt-pinned/bin/pip install --no-cache-dir -e git+https://github.com/OCA/maintainer-tools@969238e47c07d0c40573acff81d170f63245d738#egg=oca-maintainers-tools \
33-
&& ln -s /ocamt-pinned/bin/oca-gen-addon-icon /usr/local/bin/
34-
3526
# Other oca maintainer tools that are less sensitive to changes. The README generator is
3627
# not as sensitive as before because it now stores a hash of the fragments in the
3728
# generated README.rst, so it will only regenerate if the fragments have changed.
@@ -42,6 +33,7 @@ RUN set -x \
4233
&& /ocamt/bin/pip install --no-cache-dir -e git+https://github.com/OCA/maintainer-tools@fbdc8945feabe1f6f3091c1b2d517b6c4160bc2b#egg=oca-maintainers-tools \
4334
&& ln -s /ocamt/bin/oca-gen-addons-table /usr/local/bin/ \
4435
&& ln -s /ocamt/bin/oca-gen-addon-readme /usr/local/bin/ \
36+
&& ln -s /ocamt/bin/oca-gen-addon-icon /usr/local/bin/ \
4537
&& ln -s /ocamt/bin/oca-gen-metapackage /usr/local/bin/ \
4638
&& ln -s /ocamt/bin/oca-towncrier /usr/local/bin/ \
4739
&& ln -s /ocamt/bin/setuptools-odoo-make-default /usr/local/bin/ \

0 commit comments

Comments
 (0)
Please sign in to comment.