Use any nodejs version instead of forcing a version before nodejs 11

Fedora nodejs builds were fixed, we don't need to limit ourselves
anymore.

Also, make sure python3-pyyaml is installed because pylint in Fedora 31
detects its use in contribs/

Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
Reviewed-By: Stanislav Levin <slev@altlinux.org>
This commit is contained in:
Alexander Bokovoy
2019-07-16 17:49:36 +03:00
parent 5530911f20
commit d55c9b6d7f
4 changed files with 4 additions and 5 deletions

View File

@@ -28,6 +28,7 @@ steps:
builddep:
- rm -rf /var/cache/dnf/*
- "dnf makecache || :"
- dnf -y module enable nodejs:12
- dnf builddep -y ${builddep_opts} -D "with_wheels 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False
- dnf install -y gdb
- dnf update -y annobin

View File

@@ -169,7 +169,7 @@ BuildRequires: libuuid-devel
BuildRequires: libsss_idmap-devel
BuildRequires: libsss_certmap-devel
BuildRequires: libsss_nss_idmap-devel >= %{sssd_version}
BuildRequires: nodejs(abi) < 11
BuildRequires: nodejs(abi)
BuildRequires: uglify-js
BuildRequires: libverto-devel
BuildRequires: libunistring-devel

View File

@@ -6,7 +6,6 @@ ADD dist /root
RUN echo 'deltarpm = false' >> /etc/dnf/dnf.conf \
&& dnf update -y dnf \
&& dnf install -y dnf-plugins-core sudo wget systemd firewalld nss-tools iptables \
&& dnf config-manager '*modular*' --set-disabled \
&& sed -i 's/%_install_langs \(.*\)/\0:fr/g' /etc/rpm/macros.image-language-conf \
&& dnf install -y /root/rpms/*.rpm \
&& dnf clean all && rm -rf /root/rpms /root/srpms \

View File

@@ -9,15 +9,14 @@ steps:
timeout = 8
retries = 20
EOF
echo 'Disable modular repositories'
sudo dnf config-manager '*modular*' --set-disabled
echo "Fedora mirror metalink content:"
for metalink in $(sudo dnf repolist -v |grep Repo-metalink | awk '{print $2}' ) ; do echo '###############' ; echo '####' ; echo $metalink ; echo '####' ; curl $metalink ; done
echo "Fastestmirror results:"
sudo cat /var/cache/dnf/fastestmirror.cache
sudo dnf -y module enable nodejs:12
sudo dnf makecache || :
echo "Installing base development environment"
sudo dnf install -y gdb make autoconf rpm-build gettext-devel automake libtool 'nodejs(abi) < 11' docker python3-paramiko || :
sudo dnf install -y gdb make autoconf rpm-build gettext-devel automake libtool docker python3-paramiko python3-pyyaml || :
echo "Installing FreeIPA development dependencies"
sudo dnf builddep -y --skip-broken -D "with_wheels 1" -D "with_lint 1" --spec freeipa.spec.in --best --allowerasing --setopt=install_weak_deps=False || :
displayName: Prepare build environment