From 22ec240cb2b05a154f3e4d437efcb38cbc30e24a Mon Sep 17 00:00:00 2001 From: "Steven A. Falco" Date: Sat, 25 Dec 2021 10:53:10 -0500 Subject: [PATCH] Several scripting options are no longer valid Remove invalid scripting options from the yml file. --- .gitlab/Ubuntu-20.04-CI.yml | 5 ----- .gitlab/Windows-CI.yml | 5 ----- .gitlab/coverity.yml | 5 ----- .gitlab/linux-metadata-validate.yml | 5 ----- 4 files changed, 20 deletions(-) diff --git a/.gitlab/Ubuntu-20.04-CI.yml b/.gitlab/Ubuntu-20.04-CI.yml index 2b2a59707f..e4deead046 100644 --- a/.gitlab/Ubuntu-20.04-CI.yml +++ b/.gitlab/Ubuntu-20.04-CI.yml @@ -30,12 +30,7 @@ ubuntu20.04_build: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DKICAD_STDLIB_LIGHT_DEBUG=ON - -DKICAD_SCRIPTING=ON - -DKICAD_SCRIPTING_MODULES=ON - -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON - -DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON -DKICAD_BUILD_I18N=ON diff --git a/.gitlab/Windows-CI.yml b/.gitlab/Windows-CI.yml index 0330cf3edf..af0f8ef395 100644 --- a/.gitlab/Windows-CI.yml +++ b/.gitlab/Windows-CI.yml @@ -18,12 +18,7 @@ win64_build: -G "Ninja" ` -DCMAKE_TOOLCHAIN_FILE=C:\build\vcpkg\scripts\buildsystems\vcpkg.cmake ` -DCMAKE_BUILD_TYPE=Debug ` - -DKICAD_SCRIPTING=OFF ` - -DKICAD_SCRIPTING_MODULES=OFF ` - -DKICAD_SCRIPTING_PYTHON3=OFF ` -DKICAD_SCRIPTING_WXPYTHON=OFF ` - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF ` - -DKICAD_SCRIPTING_ACTION_MENU=OFF ` -DKICAD_USE_OCC=ON ` -DKICAD_SPICE=ON ` -DKICAD_BUILD_PNS_DEBUG_TOOL=ON ` diff --git a/.gitlab/coverity.yml b/.gitlab/coverity.yml index 711b738bab..49f988779c 100644 --- a/.gitlab/coverity.yml +++ b/.gitlab/coverity.yml @@ -59,12 +59,7 @@ Coverity: - cmake -DCMAKE_BUILD_TYPE=Debug -DKICAD_STDLIB_LIGHT_DEBUG=ON - -DKICAD_SCRIPTING=ON - -DKICAD_SCRIPTING_MODULES=ON - -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON - -DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON - coverity/bin/cov-build --dir cov-int make -j8 diff --git a/.gitlab/linux-metadata-validate.yml b/.gitlab/linux-metadata-validate.yml index f90a05928e..b03a66a968 100644 --- a/.gitlab/linux-metadata-validate.yml +++ b/.gitlab/linux-metadata-validate.yml @@ -30,12 +30,7 @@ validate_linux_metadata: - cmake -DCMAKE_BUILD_TYPE=Debug -DKICAD_STDLIB_LIGHT_DEBUG=ON - -DKICAD_SCRIPTING=ON - -DKICAD_SCRIPTING_MODULES=ON - -DKICAD_SCRIPTING_PYTHON3=ON -DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON - -DKICAD_SCRIPTING_ACTION_MENU=ON -DKICAD_USE_OCC=ON -DKICAD_SPICE=ON -DKICAD_BUILD_I18N=ON