Mirror_Repos/freecad_freecad
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Build: Fix Fedora test (#28041)

Browse Source
This commit is contained in:
FilippoR
2026-03-21 16:37:47 +01:00
committed by GitHub
parent 7b529e7f29
commit e8cb978257
6 changed files with 55 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/fedora-daily.yml
-39
View File
@@ -1,39 +0,0 @@
name: Fedora Daily Build
permissions:
contents: read
on:
schedule:
- cron: "00 00 * * *"
workflow_dispatch:
jobs:
trigger-copr-build:
environment: fedora-daily
env:
copr_login: ${{ secrets.COPR_LOGIN }}
copr_username: ${{ secrets.COPR_USERNAME }}
copr_token: ${{ secrets.COPR_TOKEN }}
runs-on: ubuntu-latest
container: quay.io/packit/packit
steps:
- name: setup copr token
run: |
mkdir -p ~/.config
echo \
"[copr-cli]
login = $copr_login
username = $copr_username
token = $copr_token
copr_url = https://copr.fedorainfracloud.org
" > ~/.config/copr
- name: checkout sources
uses: actions/checkout@v6
with:
submodules: recursive
fetch-depth: 500
fetch-tags: true
- name: Setup safe Git directory
run: git config --global --add safe.directory $GITHUB_WORKSPACE
- name: trigger copr build
run: |
packit build in-copr --project freecad
.packit.yaml
+14 -2
View File
@@ -52,13 +52,25 @@ jobs:
branch: main
additional_repos:
- copr://bpostle/IfcOpenShell
owner: freecad
owner: '@freecad'
project: nightly
- job: tests
identifier: main
trigger: commit
branch: main
manual_trigger: true
targets:
fedora-latest-stable:
without_opts:
- debug_info
fmf_path: package/fedora/tests
owner: '@freecad'
project: nightly
- job: copr_build
identifier: release
trigger: release
owner: freecad
owner: '@freecad'
project: freecad
additional_repos:
- copr://bpostle/IfcOpenShell
package/fedora/freecad.spec
+3 -10
View File
@@ -44,7 +44,7 @@ Source0: freecad-sources.tar.gz
# Utilities
BuildRequires: cmake gcc-c++ gettext doxygen swig graphviz gcc-gfortran desktop-file-utils tbb-devel ninja-build strace
%if %{with tests}
BuildRequires: xorg-x11-server-Xvfb python3-typing-extensions
BuildRequires: python3-typing-extensions xwayland-run weston
%if %{without bundled_gtest}
BuildRequires: gtest-devel gmock-devel
%endif
@@ -73,7 +73,7 @@ Requires: %{name}-data = %{epoch}:%{version}-%{release}
# Obsolete old doc package since it's required for functionality.
Obsoletes: %{name}-doc < 0.22-1
Requires: hicolor-icon-theme fmt python3-matplotlib python3-pivy python3-collada python3-pyside6 qt6-assistant python3-typing-extensions python3-defusedxml
Requires: hicolor-icon-theme fmt python3-matplotlib python3-pivy python3-collada python3-pyside6 qt6-assistant python3-typing-extensions python3-defusedxml python3-ply
%if %{with bundled_smesh}
Provides: bundled(smesh) = %{bundled_smesh_version}
@@ -215,19 +215,12 @@ Development file for OndselSolver
%if %{with tests}
mkdir -p %{buildroot}%tests_resultdir
if %ctest -E '^QuantitySpinBox_Tests_run$' &> %{buildroot}%tests_resultdir/ctest.result ; then
if wlheadless-run -- \%ctest &> %{buildroot}%tests_resultdir/ctest.result ; then
echo "ctest OK"
else
echo "**** Failed ctest ****"
touch %{buildroot}%tests_resultdir/ctest.failed
fi
if xvfb-run \%ctest -R '^QuantitySpinBox_Tests_run$' &>> %{buildroot}%tests_resultdir/ctest_gui.result ; then
echo "ctest gui OK"
else
echo "**** Failed ctest gui ****"
touch %{buildroot}%tests_resultdir/ctest_gui.failed
fi
%endif
desktop-file-validate %{buildroot}%{_datadir}/applications/org.freecad.FreeCAD.desktop
package/fedora/tests/build_time_tests.fmf
+1 -6
View File
@@ -4,9 +4,4 @@
if [ -f /usr/share/freecad/tests_result/`uname -m`/ctest.failed ]; then
exit 1
fi
/ctest_gui :
test: |
cat /usr/share/freecad/tests_result/`uname -m`/ctest_gui.result
if [ -f /usr/share/freecad/tests_result/`uname -m`/ctest_gui.failed ]; then
exit 1
fi
package/fedora/tests/gui_tests.fmf
+35 -35
View File
@@ -1,72 +1,72 @@
/tests:
/TestAssemblyWorkbench :
test: xvfb-run /usr/bin/FreeCAD -t TestAssemblyWorkbench
test: wlheadless-run -- /usr/bin/FreeCAD -t TestAssemblyWorkbench
/TestArch :
test: xvfb-run /usr/bin/FreeCAD -t TestArch
test: wlheadless-run -- /usr/bin/FreeCAD -t TestArch
/TestCAMApp :
test: xvfb-run /usr/bin/FreeCAD -t TestCAMApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestCAMApp
/TestDraft :
test: xvfb-run /usr/bin/FreeCAD -t TestDraft
test: wlheadless-run -- /usr/bin/FreeCAD -t TestDraft
/TestFemApp :
test: xvfb-run /usr/bin/FreeCAD -t TestFemApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestFemApp
/TestMaterialsApp :
test: xvfb-run /usr/bin/FreeCAD -t TestMaterialsApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestMaterialsApp
/MeshTestsApp :
test: xvfb-run /usr/bin/FreeCAD -t MeshTestsApp
test: wlheadless-run -- /usr/bin/FreeCAD -t MeshTestsApp
/TestPartApp :
test: xvfb-run /usr/bin/FreeCAD -t TestPartApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestPartApp
/TestPartDesignApp :
test: xvfb-run /usr/bin/FreeCAD -t TestPartDesignApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestPartDesignApp
/TestSketcherApp :
test: xvfb-run /usr/bin/FreeCAD -t TestSketcherApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestSketcherApp
/TestSpreadsheet :
test: xvfb-run /usr/bin/FreeCAD -t TestSpreadsheet
test: wlheadless-run -- /usr/bin/FreeCAD -t TestSpreadsheet
/TestSurfaceApp :
test: xvfb-run /usr/bin/FreeCAD -t TestSurfaceApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestSurfaceApp
/TestTechDrawApp :
test: xvfb-run /usr/bin/FreeCAD -t TestTechDrawApp
test: wlheadless-run -- /usr/bin/FreeCAD -t TestTechDrawApp
/BaseTests :
test: xvfb-run /usr/bin/FreeCAD -t BaseTests
test: wlheadless-run -- /usr/bin/FreeCAD -t BaseTests
/UnitTests :
test: xvfb-run /usr/bin/FreeCAD -t UnitTests
test: wlheadless-run -- /usr/bin/FreeCAD -t UnitTests
/Document :
test: xvfb-run /usr/bin/FreeCAD -t Document
test: wlheadless-run -- /usr/bin/FreeCAD -t Document
/Metadata :
test: xvfb-run /usr/bin/FreeCAD -t Metadata
test: wlheadless-run -- /usr/bin/FreeCAD -t Metadata
/StringHasher :
test: xvfb-run /usr/bin/FreeCAD -t StringHasher
test: wlheadless-run -- /usr/bin/FreeCAD -t StringHasher
/UnicodeTests :
test: xvfb-run /usr/bin/FreeCAD -t UnicodeTests
test: wlheadless-run -- /usr/bin/FreeCAD -t UnicodeTests
/TestPythonSyntax :
test: xvfb-run /usr/bin/FreeCAD -t TestPythonSyntax
test: wlheadless-run -- /usr/bin/FreeCAD -t TestPythonSyntax
/TestArchGui :
test: xvfb-run /usr/bin/FreeCAD -t TestArchGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestArchGui
/TestCAMGui :
test: xvfb-run /usr/bin/FreeCAD -t TestCAMGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestCAMGui
/TestDraftGui :
test: xvfb-run /usr/bin/FreeCAD -t TestDraftGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestDraftGui
/TestFemGui :
test: xvfb-run /usr/bin/FreeCAD -t TestFemGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestFemGui
/TestImportGui :
test: xvfb-run /usr/bin/FreeCAD -t TestImportGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestImportGui
/TestMaterialsGui :
test: xvfb-run /usr/bin/FreeCAD -t TestMaterialsGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestMaterialsGui
/TestOpenSCADGui :
test: xvfb-run /usr/bin/FreeCAD -t TestOpenSCADGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestOpenSCADGui
/TestPartGui :
test: xvfb-run /usr/bin/FreeCAD -t TestPartGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestPartGui
/TestPartDesignGui :
test: xvfb-run /usr/bin/FreeCAD -t TestPartDesignGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestPartDesignGui
/TestTechDrawGui :
test: xvfb-run /usr/bin/FreeCAD -t TestTechDrawGui
test: wlheadless-run -- /usr/bin/FreeCAD -t TestTechDrawGui
/Workbench :
test: xvfb-run /usr/bin/FreeCAD -t Workbench
test: wlheadless-run -- /usr/bin/FreeCAD -t Workbench
/Menu :
test: xvfb-run /usr/bin/FreeCAD -t Menu
test: wlheadless-run -- /usr/bin/FreeCAD -t Menu
/Menu.MenuDeleteCases :
test: xvfb-run /usr/bin/FreeCAD -t Menu.MenuDeleteCases
test: wlheadless-run -- /usr/bin/FreeCAD -t Menu.MenuDeleteCases
/Menu.MenuCreateCases :
test: xvfb-run /usr/bin/FreeCAD -t Menu.MenuCreateCases
test: wlheadless-run -- /usr/bin/FreeCAD -t Menu.MenuCreateCases
/GuiDocument :
test: xvfb-run /usr/bin/FreeCAD -t GuiDocument
test: wlheadless-run -- /usr/bin/FreeCAD -t GuiDocument
package/fedora/tests/plan.fmf
+2 -1
View File
@@ -3,7 +3,8 @@ summary:
prepare:
how: install
package:
- xorg-x11-server-Xvfb
- xwayland-run
- weston
discover:
how: fmf
execute: