From 2964d9237bf953a2b21c2eb7bc5cf21d433efbe0 Mon Sep 17 00:00:00 2001 From: Maxim Reznik Date: Sun, 27 Jun 2021 07:46:01 +0000 Subject: [PATCH] Drop NPM commands from CI scripts after removin a2js --- matreshka/packages/copr/matreshka.spec | 8 +------- matreshka/packages/travis/matreshka.spec | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/matreshka/packages/copr/matreshka.spec b/matreshka/packages/copr/matreshka.spec index f95e9a7c0..3461c1c30 100644 --- a/matreshka/packages/copr/matreshka.spec +++ b/matreshka/packages/copr/matreshka.spec @@ -460,13 +460,7 @@ make %{?_smp_mflags} GPRBUILD_FLAGS="%Gnatmake_optflags" %check ## find libs without RPATH, Fedora specific export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}/:$LD_LIBRARY_PATH" -## To find installed nodejs modules by default -npm install requirejs -export NODE_PATH=$PWD/node_modules -# FIXME http://forge.ada-ru.org/matreshka/ticket/482#ticket -%ifnarch ppc64le -make %{?_smp_mflags} GNAT_OPTFLAGS="%{GNAT_optflags}" JS_BEAUTIFY=cat check -%endif +make %{?_smp_mflags} GNAT_OPTFLAGS="%{GNAT_optflags}" check ## Delete compiled python files rm -f %{buildroot}/%{_datadir}/gdb/python/matreshka/matreshka.py? diff --git a/matreshka/packages/travis/matreshka.spec b/matreshka/packages/travis/matreshka.spec index ad0dcdc3d..a81543925 100644 --- a/matreshka/packages/travis/matreshka.spec +++ b/matreshka/packages/travis/matreshka.spec @@ -455,13 +455,7 @@ make %{?_smp_mflags} GPRBUILD_FLAGS="%Gnatmake_optflags" %check ## find libs without RPATH, Fedora specific export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}/:$LD_LIBRARY_PATH" -## To find installed nodejs modules by default -npm install requirejs -export NODE_PATH=$PWD/node_modules -# FIXME http://forge.ada-ru.org/matreshka/ticket/482#ticket -%ifnarch ppc64le -make %{?_smp_mflags} GNAT_OPTFLAGS="%{GNAT_optflags}" JS_BEAUTIFY=cat check -%endif +make %{?_smp_mflags} GNAT_OPTFLAGS="%{GNAT_optflags}" check ## Delete compiled python files rm -f %{buildroot}/%{_datadir}/gdb/python/matreshka/matreshka.py?