fix installing lsp servers not compatible with arm64
All checks were successful
Build neovim image / build-neovim-amd64 (push) Successful in 17m7s
Build neovim image / build-neovim-arm64 (push) Successful in 19m39s
Build neovim image / update-images-manifest (push) Successful in 14s

This commit is contained in:
Maciej Lebiest 2024-04-03 19:48:40 +02:00
parent 1b4d92f8fe
commit 51f5d6cd3c

View file

@ -38,7 +38,6 @@ ENV MASON_PKGS=" \
html-lsp \ html-lsp \
intelephense \ intelephense \
json-lsp \ json-lsp \
lemminx \
lua-language-server \ lua-language-server \
marksman \ marksman \
phpcs \ phpcs \
@ -50,8 +49,9 @@ ENV MASON_PKGS=" \
yaml-language-server \ yaml-language-server \
markdownlint \ markdownlint \
ansible-language-server \ ansible-language-server \
ansible-lint \ ansible-lint"
helm-ls"
ENV MASON_PKGS_NO_ARM="lemminx helm-ls"
COPY . /root/.config/nvim COPY . /root/.config/nvim
@ -62,9 +62,8 @@ RUN dnf5 install -y \
dnf5 remove -y ${BUILD_ONLY_PKGS} && \ dnf5 remove -y ${BUILD_ONLY_PKGS} && \
dnf5 -y autoremove && \ dnf5 -y autoremove && \
dnf5 clean all && \ dnf5 clean all && \
nvim --headless \ nvim --headless +"MasonInstall ${MASON_PKGS}" +qa || exit 1 ; \
+"MasonInstall ${MASON_PKGS}" \ nvim --headless +"MasonInstall ${MASON_PKGS_NO_ARM}" +qa ; \
+qa && \
echo '[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc echo '[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc
ENTRYPOINT [ "/usr/bin/nvim" ] ENTRYPOINT [ "/usr/bin/nvim" ]