Qt6 migration: Update Docker tag to ubuntu26.04 and fix submodule paths
Cosmetic changes for readability and consistency: - Update Docker image tag from ubuntu22.04 to ubuntu26.04 in all scripts - Align with Dockerfile base image (ubuntu:26.04) Files updated: - app/run_docker.sh - migration/automate_migrate_Lts_DDS.sh - migration/migrate_module.sh - final-migration/run_final_migration.sh - .github/workflows/qt6-migration.yml (submodules: recursive) - migration/run_clang_tidy_common.sh Documentation: - files/qt6-submodule-migration-changes.md: Added note about qt6-after being empty Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Entire-Checkpoint: 01M08C7DVVVDNBXGPN4M02CFB5
This commit is contained in:
7 files changed
+242
-12
No files matched your search
@@ -4,6 +4,7 @@ set -euo pipefail
|
||||
# Run final clean configure / build / test in Docker using app/run_docker.sh
|
||||
# Usage: ./final-migration/run_final_migration.sh [--jobs N]
|
||||
# Requires the Docker image from ./app/run_docker.sh to be available (run ./app/run_docker.sh --build once if needed).
|
||||
# Note: Source directory is qt-migration-legatus/qt6-after/qt6-migrated-legatus/ (submodule)
|
||||
|
||||
JOBS=5
|
||||
while [[ $# -gt 0 ]]; do
|
||||
@@ -14,8 +15,11 @@ while [[ $# -gt 0 ]]; do
|
||||
esac
|
||||
done
|
||||
|
||||
# Submodule path containing the migrated Qt6 code
|
||||
SUBMODULE_PATH="qt-migration-legatus/qt6-after/qt6-migrated-legatus"
|
||||
|
||||
# Run inside Docker: perform clean build directory, configure with Qt6, build and run ctest
|
||||
./app/run_docker.sh ../sandbox -- bash -lc \
|
||||
"set -euo pipefail && export LD_LIBRARY_PATH=/opt/Qt/6.8.3/gcc_64/lib:${LD_LIBRARY_PATH:-} && export QT_QPA_PLATFORM=offscreen && rm -rf /repo/build && cmake -S /repo -B /repo/build -G Ninja -DCMAKE_PREFIX_PATH=/opt/Qt/6.8.3/gcc_64 -DBUILD_WS=ON -DBUILD_TESTING=ON && cmake --build /repo/build -- -j${JOBS} && ctest --test-dir /repo/build --output-on-failure"
|
||||
"set -euo pipefail && export LD_LIBRARY_PATH=/opt/Qt/6.8.3/gcc_64/lib:${LD_LIBRARY_PATH:-} && export QT_QPA_PLATFORM=offscreen && rm -rf /repo/build && cmake -S /repo/${SUBMODULE_PATH} -B /repo/build -G Ninja -DCMAKE_PREFIX_PATH=/opt/Qt/6.8.3/gcc_64 -DBUILD_WS=ON -DBUILD_TESTING=ON && cmake --build /repo/build -- -j${JOBS} && ctest --test-dir /repo/build --output-on-failure"
|
||||
|
||||
echo "Final migration build + tests complete. See ./build for artifacts and test logs in ./build/Testing/Temporary."
|
||||
Reference in new issue
Block a user